Merge branch 'develop_sky_liyi' into 'develop_sky'

fix:调整sky下的ci为master_sky进行生成tag时增加前缀

See merge request StarlockTeam/app-starlock!41
This commit is contained in:
李仪 2025-05-09 08:52:06 +00:00
commit abba613a4f

View File

@ -45,6 +45,13 @@ else
done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}') done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')
next_tag="v$major.$new_minor.$new_patch" next_tag="v$major.$new_minor.$new_patch"
fi fi
# 生成新tag名时若在master_sky分支加前缀sky_
branch_name="$CI_COMMIT_BRANCH"
if [[ "$branch_name" == "master_sky" ]]; then
next_tag="sky_${next_tag}"
fi
echo "New Tag:$newest_tag;New version: $next_tag;command: $1" echo "New Tag:$newest_tag;New version: $next_tag;command: $1"
if [[ "$1" == "generate_tag" ]];then if [[ "$1" == "generate_tag" ]];then
if [ "$next_tag" == "$newest_tag" ]; then if [ "$next_tag" == "$newest_tag" ]; then