build: auto-merge.yml 2
This commit is contained in:
parent
5fa2cbe20a
commit
23d87d82c0
7
.github/workflows/auto-merge.yml
vendored
7
.github/workflows/auto-merge.yml
vendored
@ -13,21 +13,28 @@ jobs:
|
|||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
|
||||||
|
|
||||||
- name: Merge base into main
|
- name: Merge base into main
|
||||||
run: |
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
git checkout main
|
git checkout main
|
||||||
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
|
||||||
|
|
||||||
- name: Merge base into i18n
|
- name: Merge base into i18n
|
||||||
run: |
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
git checkout i18n
|
git checkout i18n
|
||||||
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
|
||||||
|
|
||||||
- name: Merge base into tabbar
|
- name: Merge base into tabbar
|
||||||
run: |
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
git checkout tabbar
|
git checkout tabbar
|
||||||
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user