Skip to content

Commit 994b7d1

Browse files
authored
Add fast replay branch to daily rebase (#607)
1 parent f75429b commit 994b7d1

File tree

3 files changed

+18
-48
lines changed

3 files changed

+18
-48
lines changed

.github/workflows/close-new-issues.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/close-new-pull-requests.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/rebase.yaml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,26 @@
1919
name: "Rebase jito-solana from upstream solana-labs/solana"
2020

2121
on:
22+
# push:
2223
schedule:
23-
- cron: "15 19 * * 1-5"
24+
- cron: "30 18 * * 1-5"
2425

2526
jobs:
2627
rebase:
2728
runs-on: ubuntu-latest
2829
strategy:
2930
matrix:
30-
branch:
31-
- master
32-
- v1.18
33-
- v1.17
31+
include:
32+
- branch: master
33+
rebase: upstream/master
34+
- branch: v1.18
35+
rebase: upstream/v1.18
36+
- branch: v1.17
37+
rebase: upstream/v1.17
38+
# note: this will always be a day behind because we're rebasing from the previous day's rebase
39+
# and NOT upstream
40+
- branch: v1.17-fast-replay
41+
rebase: origin/v1.17
3442
fail-fast: false
3543
steps:
3644
- uses: actions/checkout@v4
@@ -42,7 +50,9 @@ jobs:
4250
- name: Add upstream
4351
run: git remote add upstream https://github.com/solana-labs/solana.git
4452
- name: Fetch upstream
45-
run: git fetch upstream ${{ matrix.branch }}
53+
run: git fetch upstream
54+
- name: Fetch origin
55+
run: git fetch origin
4656
- name: Set REBASE_BRANCH
4757
run: echo "REBASE_BRANCH=ci/nightly/${{ matrix.branch }}/$(date +'%Y-%m-%d-%H-%M')" >> $GITHUB_ENV
4858
- name: echo $REBASE_BRANCH
@@ -55,7 +65,7 @@ jobs:
5565
git config --global user.name "Jito Infrastructure"
5666
- name: Rebase
5767
id: rebase
58-
run: git rebase upstream/${{ matrix.branch }}
68+
run: git rebase ${{ matrix.rebase }}
5969
- name: Send warning for rebase error
6070
if: failure() && steps.rebase.outcome == 'failure'
6171
uses: slackapi/slack-github-action@v1.25.0
@@ -154,7 +164,7 @@ jobs:
154164
run: |
155165
git checkout ${{ matrix.branch }}
156166
git reset --hard ${{ env.REBASE_BRANCH }}
157-
- name: Push rebased %{{ matrix.branch }} upstream
167+
- name: Push rebased %{{ matrix.branch }}
158168
uses: ad-m/github-push-action@master
159169
with:
160170
github_token: ${{ secrets.JITO_SOLANA_RELEASE_TOKEN }}

0 commit comments

Comments
 (0)