From fb2aec6946525c49dce863c2c1c739927daee7bb Mon Sep 17 00:00:00 2001
From: Francisco <fg@frang.io>
Date: Thu, 28 Sep 2023 19:43:33 -0300
Subject: [PATCH] Fix upgradeable patch in release branches (#4637)

(cherry picked from commit ef3e7771a7e2d9b30234a57f96ee7acf5dddb9ed)
---
 .github/workflows/upgradeable.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/upgradeable.yml b/.github/workflows/upgradeable.yml
index ed63a6dbe9e..acbd71166b8 100644
--- 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