From 914a2b04b78c573fdce43033297337712c56a241 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Mon, 11 Aug 2025 15:57:59 +0800
Subject: [PATCH] =?UTF-8?q?ci(workflow):=20=E6=B7=BB=E5=8A=A0=E4=BB=8Emain?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=88=E5=B9=B6=E5=88=B0main-v4=E5=92=8Ci1?=
 =?UTF-8?q?8n-v4=E7=9A=84=E8=87=AA=E5=8A=A8=E5=90=88=E5=B9=B6=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/auto-merge.yml | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 339c0a2..bd254bc 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -132,3 +132,39 @@ jobs:
           git checkout base-skiyee-ui
           git merge main --no-ff -m "Auto merge main into base-skiyee-ui"
           git push origin base-skiyee-ui
+
+  merge-to-main-v4:
+    name: Merge main into main-v4
+    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 main-v4
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout main-v4
+          git merge main --no-ff -m "Auto merge main into main-v4"
+          git push origin main-v4
+
+  merge-to-i18n-v4:
+    name: Merge main into i18n-v4
+    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 i18n-v4
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout i18n-v4
+          git merge main --no-ff -m "Auto merge main into i18n-v4"
+          git push origin i18n-v4