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/4] 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

From 1e9373340d2301376f364b09f0d8ecd7eea2d8ef Mon Sep 17 00:00:00 2001
From: xiang <27800734@qq.com>
Date: Fri, 9 May 2025 22:51:30 +0800
Subject: [PATCH 2/4] 1

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6074d77..fdaff87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,10 +20,10 @@ check-merge-target:
     - |
       ## 获取当前合并请求的目标分支
       TARGET_BRANCH="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
-      SOURCE_BRANCH="$CI_COMMIT_BRANCH"
+      SOURCE_BRANCH="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME "
 
       ## 定义允许合并的规则
-      if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" == "release" ]]; then
+      if [[ "$SOURCE_BRANCH " == "develop" && "$TARGET_BRANCH" == "release" ]]; then
         echo "✅ 允许合并"
       elif [[ "$SOURCE_BRANCH" == "release" && "$TARGET_BRANCH" == "master" ]]; then
         echo "✅ 允许合并"

From 3093fcfa9f24e06d940460eebc9e40e11e19d1da Mon Sep 17 00:00:00 2001
From: xiang <27800734@qq.com>
Date: Fri, 9 May 2025 22:55:00 +0800
Subject: [PATCH 3/4] 1

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdaff87..33ec2c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ check-merge-target:
       SOURCE_BRANCH="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME "
 
       ## 定义允许合并的规则
-      if [[ "$SOURCE_BRANCH " == "develop" && "$TARGET_BRANCH" == "release" ]]; then
+      if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" == "release" ]]; then
         echo "✅ 允许合并"
       elif [[ "$SOURCE_BRANCH" == "release" && "$TARGET_BRANCH" == "master" ]]; then
         echo "✅ 允许合并"

From 765dd0ee5c8b19dcecad317203f7c533264216d5 Mon Sep 17 00:00:00 2001
From: xiang <27800734@qq.com>
Date: Fri, 9 May 2025 23:00:46 +0800
Subject: [PATCH 4/4] 1

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33ec2c5..97d2e75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ check-merge-target:
     - |
       ## 获取当前合并请求的目标分支
       TARGET_BRANCH="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
-      SOURCE_BRANCH="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME "
+      SOURCE_BRANCH="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
 
       ## 定义允许合并的规则
       if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" == "release" ]]; then