sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master_sky' into 'release_sky'

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

See merge request StarlockTeam/app-starlock!48
This commit is contained in:
李仪 2025-05-09 09:19:11 +00:00
commit 7cb051ed56
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/fastlane/Fastfile
View File

@ -90,7 +90,7 @@ platform :android do
print_log "build flavor for: #{flavor}" print_log "build flavor for: #{flavor}"
build_number = Time.now.strftime("%Y%m%d%H") build_number = Time.now.strftime("%Y%m%d%H")
print_log "BuildNo #{build_number}" print_log "BuildNo #{build_number}"
build_version = $current_tag.match(/^v(\d+\.\d+\.\d+)/).captures[0] build_version = $current_tag.match(/^(sky_)?v(\d+\.\d+\.\d+)/).captures.last
print_log "buildVersion #{build_version}" print_log "buildVersion #{build_version}"
commit_hash = last_git_commit commit_hash = last_git_commit
short_hash = commit_hash[:abbreviated_commit_hash] short_hash = commit_hash[:abbreviated_commit_hash]
@ -112,7 +112,7 @@ platform :android do
print_log "build flavor for: #{flavor}" print_log "build flavor for: #{flavor}"
build_number = Time.now.strftime("%Y%m%d%H") build_number = Time.now.strftime("%Y%m%d%H")
print_log "BuildNo #{build_number}" print_log "BuildNo #{build_number}"
build_version = $current_tag.match(/^v(\d+\.\d+\.\d+)/).captures[0] build_version = $current_tag.match(/^(sky_)?v(\d+\.\d+\.\d+)/).captures.last
print_log "buildVersion #{build_version}" print_log "buildVersion #{build_version}"
commit_hash = last_git_commit commit_hash = last_git_commit
short_hash = commit_hash[:abbreviated_commit_hash] short_hash = commit_hash[:abbreviated_commit_hash]

4
tag_generator.sh
View File

@ -15,7 +15,9 @@ if [ "$tags_length" -lt 1 ]; then
next_tag="v1.0.0" next_tag="v1.0.0"
else else
newest_tag=$(echo "$tags" | head -n 1) newest_tag=$(echo "$tags" | head -n 1)
IFS='.' read -r major minor patch <<< "$newest_tag" # 去除已有的sky_前缀，防止重复
base_tag=${newest_tag#sky_}
IFS='.' read -r major minor patch <<< "$base_tag"
major="${major#v}" major="${major#v}"
compare_json="" compare_json=""
if [[ "$1" == "generate_tag" ]];then if [[ "$1" == "generate_tag" ]];then