From 8a8d1268822a8733112c4dcd8809c5f879cb3044 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Fri, 7 Nov 2025 11:04:06 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=88=A0=E9=99=A4=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 80 -------------------------------- 1 file changed, 80 deletions(-) delete mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index bc96864..0000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: Auto Merge Main to Other Branches - -on: - push: - branches: - - main - workflow_dispatch: # 手动触发 - -jobs: - merge-to-base: - name: Merge main into base - 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 base - 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 - - merge-to-base-login: - name: Merge main into base-login - 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 base-login - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout base-login - git merge main --no-ff -m "Auto merge main into base-login" - git push origin base-login - - merge-to-base-i18n: - name: Merge main into base-i18n - 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 base-i18n - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout base-i18n - git merge main --no-ff -m "Auto merge main into base-i18n" - git push origin base-i18n - - merge-to-base-i18n-login: - name: Merge main into base-i18n-login - 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 base-i18n-login - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout base-i18n-login - git merge main --no-ff -m "Auto merge main into base-i18n-login" - git push origin base-i18n-login