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

ci(auto-merge): 添加从main合并到base分支的自动合并工作流

Browse Source 
添加新的工作流步骤，实现从main分支自动合并到base分支的功能
This commit is contained in:
feige996
2025-11-03 16:51:49 +08:00
parent 444bda7809
commit adffb24e4e
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,23 @@ on:
workflow_dispatch: # 手动触发
jobs:
merge-to-base:
name: Merge main into base
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 base
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base
git merge main --no-ff -m "Auto merge main into base"
git push origin base
merge-to-wot-ui:
name: Merge main into wot-ui
runs-on: ubuntu-latest
@@ -115,24 +132,6 @@ jobs:
git merge main --no-ff -m "Auto merge main into base-uview-plus"
git push origin base-uview-plus
# merge-to-base-tm-ui:
# name: Merge main into base-tm-ui
# 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 base-tm-ui
# run: |
# git config user.name "GitHub Actions"
# git config user.email "actions@github.com"
# git checkout base-tm-ui
# git merge main --no-ff -m "Auto merge main into base-tm-ui"
# git push origin base-tm-ui
merge-to-base-skiyee-ui:
name: Merge main into base-skiyee-ui
runs-on: ubuntu-latest