yescent/yes.blog
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'release'

Browse Source 
Develop

See merge request yescent/yes.blog!20
This commit is contained in:
翔飞的风
2025-05-09 14:43:15 +00:00
parent d79479a373 e25d550720
commit a0f9f1a5d4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@@ -18,11 +18,11 @@ check-merge-target:
stage: check stage: check
script: script:
- | - |
# 获取当前合并请求的目标分支 ## 获取当前合并请求的目标分支
TARGET_BRANCH="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" TARGET_BRANCH="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
SOURCE_BRANCH="$CI_COMMIT_BRANCH" SOURCE_BRANCH="$CI_COMMIT_BRANCH"
# 定义允许合并的规则 ## 定义允许合并的规则
if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" != "release" ]]; then if [[ "$SOURCE_BRANCH" == "develop" && "$TARGET_BRANCH" != "release" ]]; then
echo "❌ 禁止将 develop 分支合并到 $TARGET_BRANCH" echo "❌ 禁止将 develop 分支合并到 $TARGET_BRANCH"
exit 1 exit 1
@@ -35,7 +35,6 @@ check-merge-target:
only: only:
- merge_requests - merge_requests
build_develop: build_develop:
stage: build stage: build
script: script: