From f9380abeb27285f81c37ce8c49768b0f5222da7e Mon Sep 17 00:00:00 2001
From: maigamo <13341529504@163.com>
Date: Mon, 23 Jun 2025 16:31:10 +0800
Subject: [PATCH 1/2] fix:test

---
 .github/workflows/main.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca009b4..f73548b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,12 +62,16 @@ jobs:
             exit 1
           fi
 
-      # 仅在 push 事件时校验提交信息格式
+      # 仅在 push 事件时校验提交信息格式，跳过合并提交
       - name: Enforce commit message format (push only)
         if: github.event_name == 'push'
         run: |
           COMMIT_MSG=$(git log -1 --pretty=%B)
           echo "Last commit: $COMMIT_MSG"
+          if echo "$COMMIT_MSG" | grep -q 'Merge branch'; then
+            echo "Merge commit detected, skipping commit message format check."
+            exit 0
+          fi
           if ! echo "$COMMIT_MSG" | grep -E -q '^(feat|fix|chore|docs|style|refactor|test)(\(.+\))?: .+'; then
             echo "❌ Commit message does not follow conventional format (e.g., 'feat: xxx')"
             exit 1

From 913c18a175480769bc926b232e843ec6073837ef Mon Sep 17 00:00:00 2001
From: maigamo <13341529504@163.com>
Date: Mon, 23 Jun 2025 16:33:31 +0800
Subject: [PATCH 2/2] Update main.yml

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f73548b..b99460f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,7 +72,8 @@ jobs:
             echo "Merge commit detected, skipping commit message format check."
             exit 0
           fi
-          if ! echo "$COMMIT_MSG" | grep -E -q '^(feat|fix|chore|docs|style|refactor|test)(\(.+\))?: .+'; then
+          if ! echo "$COMMIT_MSG" | grep -E -q '^(feat|fix|chore|docs|style|refactor|test)(\(.+\))?:\s*.+'
+          then
             echo "❌ Commit message does not follow conventional format (e.g., 'feat: xxx')"
             exit 1
           fi