diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index e0779aa..3feefa2 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -7,8 +7,8 @@ on: workflow_dispatch: # 手动触发 jobs: - merge-to-base: - name: Merge main into base + merge-to-wot-ui: + name: Merge main into wot-ui runs-on: ubuntu-latest steps: - name: Checkout repository @@ -17,13 +17,13 @@ jobs: fetch-depth: 0 token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - name: Merge main into base + - name: Merge main into wot-ui run: | git config user.name "GitHub Actions" git config user.email "actions@github.com" - git checkout base - git merge main --no-ff -m "Auto merge main into base" - git push origin base + git checkout wot-ui + git merge main --no-ff -m "Auto merge main into wot-ui" + git push origin wot-ui merge-to-i18n: name: Merge main into i18n