From b8d448fcbc8886e0f3dfbe24b7dcb133d2edc7e7 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Fri, 1 Aug 2025 17:40:09 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0=E4=BB=8Emain=E5=88=B0b?=
 =?UTF-8?q?ase-skiyee-ui=E5=88=86=E6=94=AF=E7=9A=84=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=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

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

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index d762e1f..a73a021 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -96,3 +96,21 @@ jobs:
           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