From 8d953de05a1d6a3081d94b49afaf355dfcd1de12 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 8 Jul 2025 18:17:50 +0800
Subject: [PATCH] =?UTF-8?q?ci(workflow):=20=E6=B7=BB=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6main=E5=88=B0release=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E7=9A=84=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 b1ea5c2..5c4005b 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,6 +7,24 @@ on:
   workflow_dispatch: # 手动触发
 
 jobs:
+  merge-to-release:
+    name: Merge main into release
+    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 release
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout release
+          git merge main --no-ff -m "Auto merge main into release"
+          git push origin release
+
   merge-to-i18n:
     name: Merge main into i18n
     runs-on: ubuntu-latest