From fd6a382278ebb6e38d43b28e174e702ccb3ab15a Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Fri, 7 Nov 2025 08:06:57 +0800
Subject: [PATCH] =?UTF-8?q?ci(workflow):=20=E6=9B=B4=E6=96=B0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除旧的合并任务并添加新的合并目标分支
---
 .github/workflows/auto-merge.yml | 109 ++++++-------------------------
 1 file changed, 19 insertions(+), 90 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 5063f27..bc96864 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -24,8 +24,9 @@ jobs:
           git checkout base
           git merge main --no-ff -m "Auto merge main into base"
           git push origin base
-  merge-to-wot-ui:
-    name: Merge main into wot-ui
+
+  merge-to-base-login:
+    name: Merge main into base-login
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -34,16 +35,16 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
 
-      - name: Merge main into wot-ui
+      - name: Merge main into base-login
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
-          git checkout wot-ui
-          git merge main --no-ff -m "Auto merge main into wot-ui"
-          git push origin wot-ui
+          git checkout base-login
+          git merge main --no-ff -m "Auto merge main into base-login"
+          git push origin base-login
 
-  merge-to-i18n:
-    name: Merge main into i18n
+  merge-to-base-i18n:
+    name: Merge main into base-i18n
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -52,16 +53,16 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
 
-      - name: Merge main into i18n
+      - name: Merge main into base-i18n
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
-          git checkout i18n
-          git merge main --no-ff -m "Auto merge main into i18n"
-          git push origin i18n
+          git checkout base-i18n
+          git merge main --no-ff -m "Auto merge main into base-i18n"
+          git push origin base-i18n
 
-  merge-to-base-sard-ui:
-    name: Merge main into base-sard-ui
+  merge-to-base-i18n-login:
+    name: Merge main into base-i18n-login
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -70,82 +71,10 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
 
-      - name: Merge main into base-sard-ui
+      - name: Merge main into base-i18n-login
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
-          git checkout base-sard-ui
-          git merge main --no-ff -m "Auto merge main into base-sard-ui"
-          git push origin base-sard-ui
-
-  merge-to-base-uv-ui:
-    name: Merge main into base-uv-ui
-    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-uv-ui
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-uv-ui
-          git merge main --no-ff -m "Auto merge main into base-uv-ui"
-          git push origin base-uv-ui
-
-  merge-to-base-uview-pro:
-    name: Merge main into base-uview-pro
-    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-uview-pro
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-uview-pro
-          git merge main --no-ff -m "Auto merge main into base-uview-pro"
-          git push origin base-uview-pro
-
-  merge-to-base-uview-plus:
-    name: Merge main into base-uview-plus
-    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-uview-plus
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-uview-plus
-          git merge main --no-ff -m "Auto merge main into base-uview-plus"
-          git push origin base-uview-plus
-
-  merge-to-base-skiyee-ui:
-    name: Merge main into base-skiyee-ui
-    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-skiyee-ui
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-skiyee-ui
-          git merge main --no-ff -m "Auto merge main into base-skiyee-ui"
-          git push origin base-skiyee-ui
+          git checkout base-i18n-login
+          git merge main --no-ff -m "Auto merge main into base-i18n-login"
+          git push origin base-i18n-login