From c43cabe6c6136747ea625a6da71de12e495ecdc3 Mon Sep 17 00:00:00 2001
From: xilesun <2013xile@gmail.com>
Date: Fri, 8 Nov 2024 15:00:11 +0800
Subject: [PATCH] chore: update

---
 .github/workflows/manual-release-major.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/manual-release-major.yml b/.github/workflows/manual-release-major.yml
index 87a4add47c..e63adc7dd2 100644
--- a/.github/workflows/manual-release-major.yml
+++ b/.github/workflows/manual-release-major.yml
@@ -111,7 +111,6 @@ jobs:
       - name: Release major (main)
         shell: bash
         run: |
-          git checkout main
           bash release.sh --is-feat --is-beta
         env:
           PRO_PLUGIN_REPOS: ${{ vars.NEXT_PRO_PLUGIN_REPOS }}
@@ -119,6 +118,15 @@ jobs:
       - name: Release major (next)
         shell: bash
         run: |
+          for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
+          do
+            cd ./packages/pro-plugins/@nocobase/$repo
+            git checkout next
+            cd ../../../../
+          done
+          cd ./packages/pro-plugins
+          git checkout next
+          cd ../../
           git checkout next
           bash release.sh --is-feat
         env:
@@ -130,15 +138,12 @@ jobs:
           for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
           do
             cd ./packages/pro-plugins/@nocobase/$repo
-            git checkout next
             git merge -X ours main --no-edit
             cd ../../../../
           done
           cd ./packages/pro-plugins
-          git checkout next
           git merge -X ours main --no-edit
           cd ../../
-          git checkout next
           git merge -X ours main --no-edit
       # - name: Push
       #   shell: bash