ci: 简化自动合并工作流,仅合并main到aliyun分支

简化了自动合并工作流,删除了对base分支的合并操作,仅保留将main分支合并到aliyun分支的步骤,以减少不必要的合并操作。
This commit is contained in:
feige996 2025-05-22 15:39:27 +08:00
parent c1b901ae74
commit 0c95957493

View File

@ -16,34 +16,10 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into main
- name: Merge main into aliyun
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout main
git merge base --no-ff -m "Auto merge base into main"
git push origin main
- name: Merge base into i18n
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout i18n
git merge base --no-ff -m "Auto merge base into i18n"
git push origin i18n
- name: Merge base into tabbar
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout tabbar
git merge base --no-ff -m "Auto merge base into tabbar"
git push origin tabbar
- name: Merge base into spa
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout spa
git merge base --no-ff -m "Auto merge base into spa"
git push origin spa
git checkout aliyun
git merge main --no-ff -m "Auto merge main into aliyun"
git push origin aliyun