Auto merge base into spa

This commit is contained in:
GitHub Actions 2025-05-28 03:40:46 +00:00
commit 817b6c4a81
2 changed files with 32 additions and 1 deletions

View File

@ -7,7 +7,8 @@ on:
workflow_dispatch: # 手动触发 workflow_dispatch: # 手动触发
jobs: jobs:
auto-merge: merge-to-main:
name: Merge base into main
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -24,6 +25,16 @@ jobs:
git merge base --no-ff -m "Auto merge base into main" git merge base --no-ff -m "Auto merge base into main"
git push origin main git push origin main
merge-to-i18n:
name: Merge base into i18n
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into i18n - name: Merge base into i18n
run: | run: |
git config user.name "GitHub Actions" git config user.name "GitHub Actions"
@ -32,6 +43,16 @@ jobs:
git merge base --no-ff -m "Auto merge base into i18n" git merge base --no-ff -m "Auto merge base into i18n"
git push origin i18n git push origin i18n
merge-to-tabbar:
name: Merge base into tabbar
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into tabbar - name: Merge base into tabbar
run: | run: |
git config user.name "GitHub Actions" git config user.name "GitHub Actions"
@ -40,6 +61,16 @@ jobs:
git merge base --no-ff -m "Auto merge base into tabbar" git merge base --no-ff -m "Auto merge base into tabbar"
git push origin tabbar git push origin tabbar
merge-to-spa:
name: Merge base into spa
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into spa - name: Merge base into spa
run: | run: |
git config user.name "GitHub Actions" git config user.name "GitHub Actions"