Skip to content

Commit

Permalink
Add fast replay branch to daily rebase (jito-foundation#607)
Browse files Browse the repository at this point in the history
  • Loading branch information
buffalu authored Mar 27, 2024
1 parent f75429b commit 994b7d1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 48 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/close-new-issues.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/close-new-pull-requests.yml

This file was deleted.

26 changes: 18 additions & 8 deletions .github/workflows/rebase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,26 @@
name: "Rebase jito-solana from upstream solana-labs/solana"

on:
# push:
schedule:
- cron: "15 19 * * 1-5"
- cron: "30 18 * * 1-5"

jobs:
rebase:
runs-on: ubuntu-latest
strategy:
matrix:
branch:
- master
- v1.18
- v1.17
include:
- branch: master
rebase: upstream/master
- branch: v1.18
rebase: upstream/v1.18
- branch: v1.17
rebase: upstream/v1.17
# note: this will always be a day behind because we're rebasing from the previous day's rebase
# and NOT upstream
- branch: v1.17-fast-replay
rebase: origin/v1.17
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand All @@ -42,7 +50,9 @@ jobs:
- name: Add upstream
run: git remote add upstream https://github.com/solana-labs/solana.git
- name: Fetch upstream
run: git fetch upstream ${{ matrix.branch }}
run: git fetch upstream
- name: Fetch origin
run: git fetch origin
- name: Set REBASE_BRANCH
run: echo "REBASE_BRANCH=ci/nightly/${{ matrix.branch }}/$(date +'%Y-%m-%d-%H-%M')" >> $GITHUB_ENV
- name: echo $REBASE_BRANCH
Expand All @@ -55,7 +65,7 @@ jobs:
git config --global user.name "Jito Infrastructure"
- name: Rebase
id: rebase
run: git rebase upstream/${{ matrix.branch }}
run: git rebase ${{ matrix.rebase }}
- name: Send warning for rebase error
if: failure() && steps.rebase.outcome == 'failure'
uses: slackapi/[email protected]
Expand Down Expand Up @@ -154,7 +164,7 @@ jobs:
run: |
git checkout ${{ matrix.branch }}
git reset --hard ${{ env.REBASE_BRANCH }}
- name: Push rebased %{{ matrix.branch }} upstream
- name: Push rebased %{{ matrix.branch }}
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.JITO_SOLANA_RELEASE_TOKEN }}
Expand Down

0 comments on commit 994b7d1

Please sign in to comment.