Merge branch 'develop_sky' into 'master_sky'
fix:调整sky下的ci为master_sky进行生成tag时增加前缀 See merge request StarlockTeam/app-starlock!45
This commit is contained in:
commit
52e93c7b39
@ -90,7 +90,7 @@ platform :android do
|
||||
print_log "build flavor for: #{flavor}"
|
||||
build_number = Time.now.strftime("%Y%m%d%H")
|
||||
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}"
|
||||
commit_hash = last_git_commit
|
||||
short_hash = commit_hash[:abbreviated_commit_hash]
|
||||
@ -112,7 +112,7 @@ platform :android do
|
||||
print_log "build flavor for: #{flavor}"
|
||||
build_number = Time.now.strftime("%Y%m%d%H")
|
||||
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}"
|
||||
commit_hash = last_git_commit
|
||||
short_hash = commit_hash[:abbreviated_commit_hash]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user