From ba7252c3321403b0fd5fc1a4f9ad806d1664b489 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Sat, 21 Jun 2025 15:11:43 +0800 Subject: [PATCH] =?UTF-8?q?ci(workflow):=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E9=9C=80=E8=A6=81=E7=9A=84=E8=87=AA=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=B7=A5=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除针对 tabbar 和 spa 分支的自动合并工作流配置,仅保留 i18n 分支的配置 --- .github/workflows/auto-merge.yml | 36 -------------------------------- 1 file changed, 36 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index e9baabc..74785d3 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -24,39 +24,3 @@ jobs: git checkout i18n git merge main --no-ff -m "Auto merge main into i18n" git push origin i18n - - merge-to-tabbar: - name: Merge main into tabbar - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - - name: Merge main into tabbar - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout tabbar - git merge main --no-ff -m "Auto merge main into tabbar" - git push origin tabbar - - merge-to-spa: - name: Merge main into spa - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - - name: Merge main into spa - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout spa - git merge main --no-ff -m "Auto merge main into spa" - git push origin spa