Merge branch 'develop_sky' into 'master_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀 See merge request StarlockTeam/app-starlock!42
This commit is contained in:
commit
ca8c07087f
@ -45,6 +45,13 @@ else
|
||||
done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')
|
||||
next_tag="v$major.$new_minor.$new_patch"
|
||||
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"
|
||||
if [[ "$1" == "generate_tag" ]];then
|
||||
if [ "$next_tag" == "$newest_tag" ]; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user