chore: update

This commit is contained in:
xilesun 2024-11-08 15:00:11 +08:00
parent 3b1c1d558a
commit c43cabe6c6

View File

@ -111,7 +111,6 @@ jobs:
- name: Release major (main) - name: Release major (main)
shell: bash shell: bash
run: | run: |
git checkout main
bash release.sh --is-feat --is-beta bash release.sh --is-feat --is-beta
env: env:
PRO_PLUGIN_REPOS: ${{ vars.NEXT_PRO_PLUGIN_REPOS }} PRO_PLUGIN_REPOS: ${{ vars.NEXT_PRO_PLUGIN_REPOS }}
@ -119,6 +118,15 @@ jobs:
- name: Release major (next) - name: Release major (next)
shell: bash shell: bash
run: | 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 git checkout next
bash release.sh --is-feat bash release.sh --is-feat
env: env:
@ -130,15 +138,12 @@ jobs:
for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }} for repo in ${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ' ') }} ${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ' ') }}
do do
cd ./packages/pro-plugins/@nocobase/$repo cd ./packages/pro-plugins/@nocobase/$repo
git checkout next
git merge -X ours main --no-edit git merge -X ours main --no-edit
cd ../../../../ cd ../../../../
done done
cd ./packages/pro-plugins cd ./packages/pro-plugins
git checkout next
git merge -X ours main --no-edit git merge -X ours main --no-edit
cd ../../ cd ../../
git checkout next
git merge -X ours main --no-edit git merge -X ours main --no-edit
# - name: Push # - name: Push
# shell: bash # shell: bash