forked from jito-foundation/jito-solana
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add fast replay branch to daily rebase (jito-foundation#607)
- Loading branch information
Showing
3 changed files
with
18 additions
and
48 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|
@@ -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] | ||
|
@@ -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 }} | ||
|