Fix upgradeable patch in release branches (#4637)

(cherry picked from commit ef3e777)
OpenZeppelin · Sep 28, 2023 · fb2aec6 · fb2aec6
1 parent 322df42
commit fb2aec6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/upgradeable.yml b/.github/workflows/upgradeable.yml
@@ -18,10 +18,12 @@ jobs:
           token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
       - name: Fetch current non-upgradeable branch
         run: |
-          git fetch "https://github.com/${{ github.repository }}.git" "$REF"
+          git fetch "$REMOTE" master # Fetch default branch first for patch to apply cleanly
+          git fetch "$REMOTE" "$REF"
           git checkout FETCH_HEAD
         env:
           REF: ${{ github.ref }}
+          REMOTE: https://github.com/${{ github.repository }}.git
       - name: Set up environment
         uses: ./.github/actions/setup
       - run: bash scripts/git-user-config.sh