From 2fde801e2c87045b6e42f842cc97c8b7fed68ad6 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Tue, 22 Oct 2024 09:57:17 +0800 Subject: [PATCH] =?UTF-8?q?other=EF=BC=9A=20=E6=96=B0=E5=A2=9Ecanary?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=89=93=E5=8C=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tag_generator.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tag_generator.sh b/tag_generator.sh index 2bde885e..91e37105 100755 --- a/tag_generator.sh +++ b/tag_generator.sh @@ -26,7 +26,7 @@ else compare_json=$(curl -s --header "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/compare?from=master&to=$CI_COMMIT_BRANCH") fi echo "compare_json:$compare_json\n" - new_patch=patch + new_patch=$patch while IFS= read -r commit_json; do # 使用 jq 解析每一行的 JSON 对象 commit_id=$(echo "$commit_json" | jq -r '.id') @@ -36,9 +36,9 @@ else ((minor++)) new_patch=0 break - elif [[ "$commit_message" =~ ("fix:"*) ]] && [[ new_patch == path ]]; then + elif [[ "$commit_message" =~ ("fix:"*) ]] && [[ new_patch == patch ]]; then ((new_patch++)) - elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]] && [[ new_patch == path ]]; then + elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]] && [[ new_patch == patch ]]; then ((new_patch++)) fi done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')