From 994b7d19138d01ebf40d87236811983241cbca06 Mon Sep 17 00:00:00 2001
From: buffalu <85544055+buffalu@users.noreply.github.com>
Date: Wed, 27 Mar 2024 12:59:36 -0500
Subject: [PATCH] Add fast replay branch to daily rebase (#607)

---
 .github/workflows/close-new-issues.yml        | 20 --------------
 .github/workflows/close-new-pull-requests.yml | 20 --------------
 .github/workflows/rebase.yaml                 | 26 +++++++++++++------
 3 files changed, 18 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/close-new-issues.yml
 delete mode 100644 .github/workflows/close-new-pull-requests.yml

diff --git a/.github/workflows/close-new-issues.yml b/.github/workflows/close-new-issues.yml
deleted file mode 100644
index 2d10a66fd5..0000000000
--- a/.github/workflows/close-new-issues.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Close new issues
-
-on:
-  issues:
-    types: [opened, reopened]
-
-jobs:
-  comment-and-close:
-    runs-on: ubuntu-latest
-    steps:
-      - shell: bash
-        env:
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}
-          COMMENT: >
-            This repository is no longer in use. Please re-open this
-            issue in the agave repo: https://github.com/anza-xyz/agave
-        run: >
-          gh issue close "$ISSUE_NUMBER" --comment "$COMMENT"
diff --git a/.github/workflows/close-new-pull-requests.yml b/.github/workflows/close-new-pull-requests.yml
deleted file mode 100644
index 1da0ad1d33..0000000000
--- a/.github/workflows/close-new-pull-requests.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Close new pull requests
-
-on:
-  pull_request:
-    types: [opened, reopened]
-
-jobs:
-  comment-and-close:
-    runs-on: ubuntu-latest
-    steps:
-      - shell: bash
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}
-          COMMENT: >
-            This repository is no longer in use. Please re-open this
-            pull request in the agave repo: https://github.com/anza-xyz/agave
-        run: >
-          gh pr close "$PR_NUMBER" --comment "$COMMENT"
diff --git a/.github/workflows/rebase.yaml b/.github/workflows/rebase.yaml
index bdb76c7bbe..c596dd10c5 100644
--- a/.github/workflows/rebase.yaml
+++ b/.github/workflows/rebase.yaml
@@ -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/slack-github-action@v1.25.0
@@ -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 }}