Auto merge base into tabbar
This commit is contained in:
commit
fe751745e5
18
.github/workflows/auto-merge.yml
vendored
18
.github/workflows/auto-merge.yml
vendored
@ -7,24 +7,6 @@ on:
|
|||||||
workflow_dispatch: # 手动触发
|
workflow_dispatch: # 手动触发
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
merge-to-main:
|
|
||||||
name: Merge base into main
|
|
||||||
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 main
|
|
||||||
run: |
|
|
||||||
git config user.name "GitHub Actions"
|
|
||||||
git config user.email "actions@github.com"
|
|
||||||
git checkout main
|
|
||||||
git merge base --no-ff -m "Auto merge base into main"
|
|
||||||
git push origin main
|
|
||||||
|
|
||||||
merge-to-i18n:
|
merge-to-i18n:
|
||||||
name: Merge base into i18n
|
name: Merge base into i18n
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
Loading…
x
Reference in New Issue
Block a user