From 039a69b2d5fc629b0e6c66955b2452ee6e7f5869 Mon Sep 17 00:00:00 2001
From: xiang <27800734@qq.com>
Date: Fri, 9 May 2025 22:47:28 +0800
Subject: [PATCH] 1

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ab53e4..6074d77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,14 +23,13 @@ check-merge-target:
       SOURCE_BRANCH="$CI_COMMIT_BRANCH"
 
       ## 定义允许合并的规则
-      if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" != "release" ]]; then
-        echo "❌ 禁止将 develop 分支合并到 $TARGET_BRANCH"
-        exit 1
-      elif [[ "$SOURCE_BRANCH" == "release" && "$TARGET_BRANCH" != "master" ]]; then
-        echo "❌ 禁止将 release 分支合并到 $TARGET_BRANCH"
-        exit 1
-      else
+      if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" == "release" ]]; then
         echo "✅ 允许合并"
+      elif [[ "$SOURCE_BRANCH" == "release" && "$TARGET_BRANCH" == "master" ]]; then
+        echo "✅ 允许合并"
+      else
+        echo "❌ 禁止将 $SOURCE_BRANCH 分支合并到 $TARGET_BRANCH"
+        exit 1
       fi
   only:
     - merge_requests