XW-AIOT/aiot-uniapp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci(workflow): 更新自动合并工作流配置

Browse Source 
- 启用从main到base分支的自动合并
- 移除main-v4和i18n-v4相关的合并任务
This commit is contained in:
feige996
2025-10-22 09:44:05 +08:00
parent da99a61b2f
commit b7cb032174
1 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
.github/workflows/auto-merge.yml vendored
View File

@@ -7,23 +7,23 @@ on:
workflow_dispatch: # 手动触发 workflow_dispatch: # 手动触发
jobs: jobs:
# merge-to-release: merge-to-base:
# name: Merge main into release name: Merge main into base
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Checkout repository - name: Checkout repository
# uses: actions/checkout@v4 uses: actions/checkout@v4
# with: with:
# fetch-depth: 0 fetch-depth: 0
# token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
# - name: Merge main into release - name: Merge main into base
# run: | run: |
# git config user.name "GitHub Actions" git config user.name "GitHub Actions"
# git config user.email "actions@github.com" git config user.email "actions@github.com"
# git checkout release git checkout base
# git merge main --no-ff -m "Auto merge main into release" git merge main --no-ff -m "Auto merge main into base"
# git push origin release git push origin base
merge-to-i18n: merge-to-i18n:
name: Merge main into i18n name: Merge main into i18n
@@ -150,39 +150,3 @@ jobs:
git checkout base-skiyee-ui git checkout base-skiyee-ui
git merge main --no-ff -m "Auto merge main into base-skiyee-ui" git merge main --no-ff -m "Auto merge main into base-skiyee-ui"
git push origin base-skiyee-ui git push origin base-skiyee-ui
merge-to-main-v4:
name: Merge main into main-v4
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into main-v4
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout main-v4
git merge main --no-ff -m "Auto merge main into main-v4"
git push origin main-v4
merge-to-i18n-v4:
name: Merge main into i18n-v4
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into i18n-v4
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout i18n-v4
git merge main --no-ff -m "Auto merge main into i18n-v4"
git push origin i18n-v4