From 6ca56573b6d97409cff29ac6e4cdba610b2d0164 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Wed, 22 Oct 2025 09:48:49 +0800 Subject: [PATCH] =?UTF-8?q?ci(workflow):=20=E5=B0=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9B=AE=E6=A0=87=E5=88=86=E6=94=AF=E4=BB=8E?= =?UTF-8?q?base=E6=94=B9=E4=B8=BAwot-ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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