From 7baaddfc9657ccebee4f15d10dcfc1d8156e923d Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Sat, 19 Jul 2025 22:54:05 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E7=A7=BB=E9=99=A4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=B0release=E5=88=86=E6=94=AF=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

保留i18n分支的自动合并功能，移除不再需要的release分支自动合并
---
 .github/workflows/auto-merge.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 5c4005b..d762e1f 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,23 +7,23 @@ 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 }}
+  # 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
+  #     - 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