From a5203d2e0f87f2ebfc96d40401b5224db46bd88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=A3=E5=86=9B?= <jdaiuu@163.com>
Date: Thu, 12 Sep 2024 15:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=B9=E9=85=8D=E5=B7=AE?=
 =?UTF-8?q?=E5=BC=82=E6=BA=90=E4=B8=BA=E4=B8=AA=E4=BA=BA=E7=9A=84=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/go-package.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/go-package.yml b/.github/workflows/go-package.yml
index 8702204f..3f2aacb4 100644
--- a/.github/workflows/go-package.yml
+++ b/.github/workflows/go-package.yml
@@ -38,30 +38,47 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - name: Git Clone And Checkout Branch
       run: |
+        # 配置仓库地址，确保 fork 仓库的地址正确
         fork_repo="https://github.com/$GITHUB_ACTOR/app-builder.git"
         mkdir cicd
         cd cicd
+
+        # 克隆 fork 仓库
         git clone $fork_repo
         cd app-builder
+
+        # 切换到当前的 pull request 分支
         git checkout $GITHUB_HEAD_REF
+
+        # 添加上游仓库（upstream）并获取最新更新
         git remote add upstream https://github.com/baidubce/app-builder.git 
         git fetch upstream
+
+        # 确保拉取最新的 origin 分支
+        git remote add origin https://github.com/$GITHUB_ACTOR/app-builder.git
+        git fetch origin
+
+        # 显示远程仓库的配置
         git remote -v
+
+        # 显示当前分支的状态
         git status
 
-        # 找到当前分支与 upstream/master 的共同祖先提交
-        merge_base=$(git merge-base HEAD upstream/master)
+        # 找到当前分支与 origin/dj-go-version-branch 的共同祖先提交
+        merge_base=$(git merge-base HEAD origin/dj-go-version-branch)
         echo "merge_base=$merge_base"
 
         # 比较当前分支与 merge_base 之间的差异
         changed_files=$(git diff --name-only --diff-filter=ACMRT $merge_base)
         changed_files_go_sh=$(git diff --name-only --diff-filter=ACMRT $merge_base -- '*.go' '*.mod' '*.sum')
 
+        # 输出检测到的更改文件
         echo "发生更改的文件为:"
         echo "$changed_files"
 
         echo "发生更改的Go或Shell文件为:"
 
+        # 如果检测到 .go, .mod, .sum 文件有变化，则设置环境变量
         if [ -n "$changed_files_go_sh" ]; then
           export APPBUILDER_GO_TESTS=True
           echo "$changed_files_go_sh"
@@ -70,6 +87,7 @@ jobs:
           echo "没有检测到Go或Shell文件被更改"
         fi
 
+        # 将 APPBUILDER_GO_TESTS 环境变量写入到 GitHub Actions 的环境
         echo "APPBUILDER_GO_TESTS=$APPBUILDER_GO_TESTS" >> $GITHUB_ENV
     - name: Install dependencies
       run: |