|
|
@@ -1,14 +1,14 @@
|
|
|
-name: Auto Merge Base to Other Branches
|
|
|
+name: Auto Merge Main to Other Branches
|
|
|
|
|
|
on:
|
|
|
push:
|
|
|
branches:
|
|
|
- - base
|
|
|
+ - main
|
|
|
workflow_dispatch: # 手动触发
|
|
|
|
|
|
jobs:
|
|
|
merge-to-i18n:
|
|
|
- name: Merge base into i18n
|
|
|
+ name: Merge main into i18n
|
|
|
runs-on: ubuntu-latest
|
|
|
steps:
|
|
|
- name: Checkout repository
|
|
|
@@ -17,16 +17,16 @@ jobs:
|
|
|
fetch-depth: 0
|
|
|
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
|
|
|
|
|
|
- - name: Merge base into i18n
|
|
|
+ - name: Merge main 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 merge main --no-ff -m "Auto merge main into i18n"
|
|
|
git push origin i18n
|
|
|
|
|
|
merge-to-tabbar:
|
|
|
- name: Merge base into tabbar
|
|
|
+ name: Merge main into tabbar
|
|
|
runs-on: ubuntu-latest
|
|
|
steps:
|
|
|
- name: Checkout repository
|
|
|
@@ -35,16 +35,16 @@ jobs:
|
|
|
fetch-depth: 0
|
|
|
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
|
|
|
|
|
|
- - name: Merge base into tabbar
|
|
|
+ - name: Merge main 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 merge main --no-ff -m "Auto merge main into tabbar"
|
|
|
git push origin tabbar
|
|
|
|
|
|
merge-to-spa:
|
|
|
- name: Merge base into spa
|
|
|
+ name: Merge main into spa
|
|
|
runs-on: ubuntu-latest
|
|
|
steps:
|
|
|
- name: Checkout repository
|
|
|
@@ -53,10 +53,10 @@ jobs:
|
|
|
fetch-depth: 0
|
|
|
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
|
|
|
|
|
|
- - name: Merge base into spa
|
|
|
+ - name: Merge main 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 merge main --no-ff -m "Auto merge main into spa"
|
|
|
git push origin spa
|