|
19 | 19 | name: "Rebase jito-solana from upstream solana-labs/solana" |
20 | 20 |
|
21 | 21 | on: |
| 22 | + # push: |
22 | 23 | schedule: |
23 | | - - cron: "15 19 * * 1-5" |
| 24 | + - cron: "30 18 * * 1-5" |
24 | 25 |
|
25 | 26 | jobs: |
26 | 27 | rebase: |
27 | 28 | runs-on: ubuntu-latest |
28 | 29 | strategy: |
29 | 30 | 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 |
34 | 42 | fail-fast: false |
35 | 43 | steps: |
36 | 44 | - uses: actions/checkout@v4 |
|
42 | 50 | - name: Add upstream |
43 | 51 | run: git remote add upstream https://github.com/solana-labs/solana.git |
44 | 52 | - name: Fetch upstream |
45 | | - run: git fetch upstream ${{ matrix.branch }} |
| 53 | + run: git fetch upstream |
| 54 | + - name: Fetch origin |
| 55 | + run: git fetch origin |
46 | 56 | - name: Set REBASE_BRANCH |
47 | 57 | run: echo "REBASE_BRANCH=ci/nightly/${{ matrix.branch }}/$(date +'%Y-%m-%d-%H-%M')" >> $GITHUB_ENV |
48 | 58 | - name: echo $REBASE_BRANCH |
|
55 | 65 | git config --global user.name "Jito Infrastructure" |
56 | 66 | - name: Rebase |
57 | 67 | id: rebase |
58 | | - run: git rebase upstream/${{ matrix.branch }} |
| 68 | + run: git rebase ${{ matrix.rebase }} |
59 | 69 | - name: Send warning for rebase error |
60 | 70 | if: failure() && steps.rebase.outcome == 'failure' |
61 | 71 | uses: slackapi/slack-github-action@v1.25.0 |
@@ -154,7 +164,7 @@ jobs: |
154 | 164 | run: | |
155 | 165 | git checkout ${{ matrix.branch }} |
156 | 166 | git reset --hard ${{ env.REBASE_BRANCH }} |
157 | | - - name: Push rebased %{{ matrix.branch }} upstream |
| 167 | + - name: Push rebased %{{ matrix.branch }} |
158 | 168 | uses: ad-m/github-push-action@master |
159 | 169 | with: |
160 | 170 | github_token: ${{ secrets.JITO_SOLANA_RELEASE_TOKEN }} |
|
0 commit comments