From 2d6f2f76f361518ae92445a3ccee9848d9387899 Mon Sep 17 00:00:00 2001 From: Lucas B Date: Wed, 27 Mar 2024 12:44:18 -0500 Subject: [PATCH] add back in fetch origin --- .github/workflows/rebase.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yaml b/.github/workflows/rebase.yaml index 5cdb974f44..c70f3d01c6 100644 --- a/.github/workflows/rebase.yaml +++ b/.github/workflows/rebase.yaml @@ -43,13 +43,16 @@ jobs: steps: - uses: actions/checkout@v4 with: + ref: ${{ matrix.branch }} # TODO (LB): need to add rebase branch here? submodules: recursive + fetch-depth: 0 token: ${{ secrets.JITO_SOLANA_RELEASE_TOKEN }} - - run: git checkout ${{ matrix.branch }} && git submodule update -i -r - name: Add upstream run: git remote add upstream https://github.com/solana-labs/solana.git - name: Fetch upstream 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