other： 新增canary版本打包逻辑

tag_generator.sh

@@ -26,6 +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
   while IFS= read -r commit_json; do
     # 使用 jq 解析每一行的 JSON 对象
     commit_id=$(echo "$commit_json" | jq -r '.id')
@@ -33,15 +34,15 @@ else
     echo "----$commit_message"
     if [[ "$commit_message" =~ ("feat:"*) ]]; then
         ((minor++))
-        patch=0
+        new_patch=0
         break
-    elif [[ "$commit_message" =~ ("fix:"*) ]]; then
-        ((patch++))
-    elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]]; then
-        ((patch++))
+    elif [[ "$commit_message" =~ ("fix:"*) ]] && [[ new_patch == path ]]; then
+        ((new_patch++))
+    elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]] && [[ new_patch == path ]]; then
+        ((new_patch++))
     fi
   done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')
-  next_tag="v$major.$minor.$patch"
+  next_tag="v$major.$minor.$new_patch"
 fi
 echo "New Tag:$newest_tag;New version: $next_tag;command: $1"
 if [[ "$1" == "generate_tag" ]];then