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

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

Browse Source 
移除旧的合并任务并添加新的合并目标分支
This commit is contained in:
feige996
2025-11-07 08:06:57 +08:00
parent b0773b1bcb
commit fd6a382278
1 changed files with 19 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,9 @@ jobs:
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
merge-to-base-login:
name: Merge main into base-login
runs-on: ubuntu-latest
steps:
- name: Checkout repository
@@ -34,16 +35,16 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into wot-ui
- name: Merge main into base-login
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout wot-ui
git merge main --no-ff -m "Auto merge main into wot-ui"
git push origin wot-ui
git checkout base-login
git merge main --no-ff -m "Auto merge main into base-login"
git push origin base-login
merge-to-i18n:
name: Merge main into i18n
merge-to-base-i18n:
name: Merge main into base-i18n
runs-on: ubuntu-latest
steps:
- name: Checkout repository
@@ -52,16 +53,16 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into i18n
- name: Merge main into base-i18n
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout i18n
git merge main --no-ff -m "Auto merge main into i18n"
git push origin i18n
git checkout base-i18n
git merge main --no-ff -m "Auto merge main into base-i18n"
git push origin base-i18n
merge-to-base-sard-ui:
name: Merge main into base-sard-ui
merge-to-base-i18n-login:
name: Merge main into base-i18n-login
runs-on: ubuntu-latest
steps:
- name: Checkout repository
@@ -70,82 +71,10 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into base-sard-ui
- name: Merge main into base-i18n-login
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-sard-ui
git merge main --no-ff -m "Auto merge main into base-sard-ui"
git push origin base-sard-ui
merge-to-base-uv-ui:
name: Merge main into base-uv-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-uv-ui
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-uv-ui
git merge main --no-ff -m "Auto merge main into base-uv-ui"
git push origin base-uv-ui
merge-to-base-uview-pro:
name: Merge main into base-uview-pro
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-uview-pro
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-uview-pro
git merge main --no-ff -m "Auto merge main into base-uview-pro"
git push origin base-uview-pro
merge-to-base-uview-plus:
name: Merge main into base-uview-plus
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-uview-plus
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-uview-plus
git merge main --no-ff -m "Auto merge main into base-uview-plus"
git push origin base-uview-plus
merge-to-base-skiyee-ui:
name: Merge main into base-skiyee-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-skiyee-ui
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-skiyee-ui
git merge main --no-ff -m "Auto merge main into base-skiyee-ui"
git push origin base-skiyee-ui
git checkout base-i18n-login
git merge main --no-ff -m "Auto merge main into base-i18n-login"
git push origin base-i18n-login