From 73c383d2b59bb9624724779a25370e632f60b4aa Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Fri, 5 Jul 2024 23:12:26 +0800
Subject: [PATCH] fix: base ref (#4829)

---
 .github/workflows/build-pro-image.yml |  7 ++++--
 .github/workflows/e2e.yml             | 32 ++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-pro-image.yml b/.github/workflows/build-pro-image.yml
index ca45bfa287..54423c648b 100644
--- a/.github/workflows/build-pro-image.yml
+++ b/.github/workflows/build-pro-image.yml
@@ -39,8 +39,11 @@ jobs:
           ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }}
       - name: Fetch all branches
         run: cd packages/pro-plugins && git fetch --all
-      - name: git checkout ${{ github.head_ref }}
-        run: cd packages/pro-plugins && git checkout ${{ github.head_ref }}
+      - name: git checkout ${{ github.event.pull_request.base.ref }}
+        run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }}
+        continue-on-error: true
+      - name: git checkout ${{ github.head_ref || github.ref_name }}
+        run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }}
         continue-on-error: true
       - name: rm .git
         run: rm -rf packages/pro-plugins/.git &&  git config --global user.email "you@example.com"  &&  git config --global user.name "Your Name" && git add -A && git commit -m "tmp commit"
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1c86f93518..e8e643aa8a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -36,7 +36,14 @@ jobs:
           ref: main
           path: packages/pro-plugins
           ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }}
-
+      - name: Fetch all branches
+        run: cd packages/pro-plugins && git fetch --all
+      - name: git checkout ${{ github.event.pull_request.base.ref }}
+        run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }}
+        continue-on-error: true
+      - name: git checkout ${{ github.head_ref || github.ref_name }}
+        run: cd packages/pro-plugins && git checkout${{ github.head_ref || github.ref_name }}
+        continue-on-error: true
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -88,8 +95,11 @@ jobs:
           ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }}
       - name: Fetch all branches
         run: cd packages/pro-plugins && git fetch --all
-      - name: git checkout ${{ github.head_ref }}
-        run: cd packages/pro-plugins && git checkout ${{ github.head_ref }}
+      - name: git checkout ${{ github.event.pull_request.base.ref }}
+        run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }}
+        continue-on-error: true
+      - name: git checkout ${{ github.head_ref || github.ref_name }}
+        run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }}
         continue-on-error: true
       - name: Set variables
         continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错，为了能够继续执行后续步骤，所以这里设置为 continue-on-error: true
@@ -171,6 +181,14 @@ jobs:
           ref: main
           path: packages/pro-plugins
           ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }}
+      - name: Fetch all branches
+        run: cd packages/pro-plugins && git fetch --all
+      - name: git checkout ${{ github.event.pull_request.base.ref }}
+        run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }}
+        continue-on-error: true
+      - name: git checkout ${{ github.head_ref || github.ref_name }}
+        run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }}
+        continue-on-error: true
       - name: Set variables
         continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错，为了能够继续执行后续步骤，所以这里设置为 continue-on-error: true
         run: |
@@ -331,6 +349,14 @@ jobs:
           ref: main
           path: packages/pro-plugins
           ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }}
+      - name: Fetch all branches
+        run: cd packages/pro-plugins && git fetch --all
+      - name: git checkout ${{ github.event.pull_request.base.ref }}
+        run: cd packages/pro-plugins && git checkout ${{ github.event.pull_request.base.ref }}
+        continue-on-error: true
+      - name: git checkout ${{ github.head_ref || github.ref_name }}
+        run: cd packages/pro-plugins && git checkout ${{ github.head_ref || github.ref_name }}
+        continue-on-error: true
       - name: Set variables
         continue-on-error: true # 外部开发者提交 PR 的时候因为没有权限这里会报错，为了能够继续执行后续步骤，所以这里设置为 continue-on-error: true
         run: |