From e4ee24004cdc429990adbeb5b622b2af24d018c9 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Thu, 22 May 2025 18:46:38 +0800
Subject: [PATCH] =?UTF-8?q?ci(auto-merge):=20=E6=9B=B4=E6=96=B0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E5=90=8D=E7=A7=B0=E5=B9=B6=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89=E4=BB=93=E5=BA=93=E6=A3=80=E5=87=BA=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将自动合并工作流的名称从“Auto Merge Base to Other Branches”更改为“Auto Merge aliyun”，并注释掉仓库检出步骤以简化流程
---
 .github/workflows/auto-merge.yml | 12 ++++++------
 .vscode/settings.json            |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index d62b605..a10288c 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,4 +1,4 @@
-name: Auto Merge Base to Other Branches
+name: Auto Merge aliyun
 
 on:
   push:
@@ -10,11 +10,11 @@ jobs:
   auto-merge:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE2 }}
+      # - name: Checkout repository
+      #   uses: actions/checkout@v3
+      #   with:
+      #     fetch-depth: 0
+      #     token: ${{ secrets.GH_TOKEN_AUTO_MERGE2 }}
 
       - name: Merge main into aliyun
         run: |
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 904ffb7..0f7905a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -36,6 +36,7 @@
     "manifest.json": "jsonc" // manifest.json 可以写注释
   },
   "cSpell.words": [
+    "aliyun",
     "Aplipay",
     "climblee",
     "commitlint",