Skip to content

Commit ef3e777

Browse files
authored
Fix upgradeable patch in release branches (#4637)
1 parent 58463a9 commit ef3e777

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/upgradeable.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ jobs:
1818
token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
1919
- name: Fetch current non-upgradeable branch
2020
run: |
21-
git fetch "https://github.com/${{ github.repository }}.git" "$REF"
21+
git fetch "$REMOTE" master # Fetch default branch first for patch to apply cleanly
22+
git fetch "$REMOTE" "$REF"
2223
git checkout FETCH_HEAD
2324
env:
2425
REF: ${{ github.ref }}
26+
REMOTE: https://github.com/${{ github.repository }}.git
2527
- name: Set up environment
2628
uses: ./.github/actions/setup
2729
- run: bash scripts/git-user-config.sh

0 commit comments

Comments
 (0)