From adffb24e4ec17c3ec4176a262b0288ca8c3684f2 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Mon, 3 Nov 2025 16:51:49 +0800
Subject: [PATCH] =?UTF-8?q?ci(auto-merge):=20=E6=B7=BB=E5=8A=A0=E4=BB=8Ema?=
 =?UTF-8?q?in=E5=90=88=E5=B9=B6=E5=88=B0base=E5=88=86=E6=94=AF=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=88=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

添加新的工作流步骤，实现从main分支自动合并到base分支的功能
---
 .github/workflows/auto-merge.yml | 35 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 3feefa2..5063f27 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,6 +7,23 @@ on:
   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-wot-ui:
     name: Merge main into wot-ui
     runs-on: ubuntu-latest
@@ -115,24 +132,6 @@ jobs:
           git merge main --no-ff -m "Auto merge main into base-uview-plus"
           git push origin base-uview-plus
 
-  # merge-to-base-tm-ui:
-  #   name: Merge main into base-tm-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-tm-ui
-  #       run: |
-  #         git config user.name "GitHub Actions"
-  #         git config user.email "actions@github.com"
-  #         git checkout base-tm-ui
-  #         git merge main --no-ff -m "Auto merge main into base-tm-ui"
-  #         git push origin base-tm-ui
-
   merge-to-base-skiyee-ui:
     name: Merge main into base-skiyee-ui
     runs-on: ubuntu-latest