From f5796787e6925d5cfb29cb0551cbd58a5b8240c7 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:20:48 +0800
Subject: [PATCH 1/8] ci: update workflow to add upstream remote for fetching
 branches

---
 .github/workflows/workflow-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index edc37a369b..b663b675c7 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -37,8 +37,10 @@ jobs:
         env:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
+          UPSTREAM_REMOTE: ${{ github.repository }}
         run: |
-          git fetch --progress --depth=1 origin "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"
+          git remote add upstream $UPSTREAM_REMOTE
+          git fetch --progress --depth=1 upstream "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"
           MAX_ATTEMPTS=10
           ATTEMPT=0
           while [ -z "$( git merge-base "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" )" ] && [ "$ATTEMPT" -lt "$MAX_ATTEMPTS" ]; do

From 2b169c444ea79d893582bef3e85d617231a11632 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:22:01 +0800
Subject: [PATCH 2/8] upstream

---
 .github/workflows/workflow-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index b663b675c7..ebd0ba95af 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -44,7 +44,7 @@ jobs:
           MAX_ATTEMPTS=10
           ATTEMPT=0
           while [ -z "$( git merge-base "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" )" ] && [ "$ATTEMPT" -lt "$MAX_ATTEMPTS" ]; do
-            git fetch -q --deepen=10 origin "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF"
+            git fetch -q --deepen=10 upstream "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF"
             ATTEMPT=$((ATTEMPT + 1))
           done
           if [ "$ATTEMPT" -ge "$MAX_ATTEMPTS" ]; then
@@ -54,7 +54,7 @@ jobs:
       - name: Get merge base
         id: merge-base
         env:
-          CLEAN_BASE_REF: ${{ format('origin/{0}', steps.git-refs.outputs.base-ref) || github.event.base }}
+          CLEAN_BASE_REF: ${{ format('upstream/{0}', steps.git-refs.outputs.base-ref) || github.event.base }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
         run: |
           echo "merge-base=$(git merge-base "$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" || git rev-parse "$CLEAN_BASE_REF")" >> $GITHUB_OUTPUT

From 301911c00d6b586093325dc8ca34634bf09916ec Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:24:51 +0800
Subject: [PATCH 3/8] fix: repositoryUrl

---
 .github/workflows/workflow-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index ebd0ba95af..402b8deeaa 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -37,7 +37,7 @@ jobs:
         env:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
-          UPSTREAM_REMOTE: ${{ github.repository }}
+          UPSTREAM_REMOTE: ${{ github.repositoryUrl }}
         run: |
           git remote add upstream $UPSTREAM_REMOTE
           git fetch --progress --depth=1 upstream "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"

From c430ca490f8a8b65e8d37a343fd832981140d88b Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:51:00 +0800
Subject: [PATCH 4/8] fix: use `https://`

---
 .github/workflows/workflow-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index 402b8deeaa..107d01061f 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -37,7 +37,7 @@ jobs:
         env:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
-          UPSTREAM_REMOTE: ${{ github.repositoryUrl }}
+          UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repository }}
         run: |
           git remote add upstream $UPSTREAM_REMOTE
           git fetch --progress --depth=1 upstream "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"

From a96895fadd464ce9d812e67e6d1a2f9f79b81b30 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:53:42 +0800
Subject: [PATCH 5/8] fix: should fetch head ref from origin

---
 .github/workflows/workflow-build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index 107d01061f..3116cf27a0 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -37,14 +37,16 @@ jobs:
         env:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
-          UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repository }}
+          # We are not using
+          UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repositoryUrl }}
         run: |
           git remote add upstream $UPSTREAM_REMOTE
           git fetch --progress --depth=1 upstream "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"
           MAX_ATTEMPTS=10
           ATTEMPT=0
           while [ -z "$( git merge-base "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" )" ] && [ "$ATTEMPT" -lt "$MAX_ATTEMPTS" ]; do
-            git fetch -q --deepen=10 upstream "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF"
+            git fetch -q --deepen=10 upstream "refs/heads/$CLEAN_BASE_REF"
+            git fetch -q --deepen=10 origin "$CLEAN_HEAD_REF"
             ATTEMPT=$((ATTEMPT + 1))
           done
           if [ "$ATTEMPT" -ge "$MAX_ATTEMPTS" ]; then

From 652749d3593384ea237af24670ed1be077d669cb Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:56:59 +0800
Subject: [PATCH 6/8] fix: github.repository

---
 .github/workflows/workflow-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index 3116cf27a0..2c1a05030b 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -38,7 +38,7 @@ jobs:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
           # We are not using
-          UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repositoryUrl }}
+          UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repository }}
         run: |
           git remote add upstream $UPSTREAM_REMOTE
           git fetch --progress --depth=1 upstream "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"

From 17bfaf0f59fa62fa0112d32412007e8c99393957 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 15:05:43 +0800
Subject: [PATCH 7/8] retry


From 1a0bdad7661fe59d54aaafe2de6e32d7a13442e7 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 16:35:46 +0800
Subject: [PATCH 8/8] Update .github/workflows/workflow-build.yml

Signed-off-by: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
---
 .github/workflows/workflow-build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index 2c1a05030b..5396f21638 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -37,7 +37,6 @@ jobs:
         env:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
-          # We are not using
           UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repository }}
         run: |
           git remote add upstream $UPSTREAM_REMOTE