Skip to content

Commit 74e98c1

Browse files
authored
Adopt named block arguments in finalize_release lane (#13793)
2 parents d086dc6 + bd99df1 commit 74e98c1

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

fastlane/Fastfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -480,16 +480,14 @@ platform :ios do
480480
# bundle exec fastlane finalize_release skip_confirm:true
481481
#####################################################################################
482482
desc 'Trigger the final release build on CI'
483-
lane :finalize_release do |options|
483+
lane :finalize_release do |skip_confirm: false|
484484
UI.user_error!('To finalize a hotfix, please use the `finalize_hotfix_release` lane instead') if release_is_hotfix?
485485

486486
ensure_git_status_clean
487487
ensure_git_branch_is_release_branch!
488488

489489
UI.important("Finalizing release: #{release_version_current}")
490-
unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
491-
UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
492-
end
490+
UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
493491

494492
# Don't check translation coverage in CI
495493
check_translation_progress_all unless is_ci
@@ -504,9 +502,7 @@ platform :ios do
504502

505503
# Start the build
506504
UI.important('Pushing changes to remote and triggering the release build')
507-
unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
508-
UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
509-
end
505+
UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
510506

511507
push_to_git_remote(tags: false)
512508

@@ -1456,7 +1452,7 @@ def create_backmerge_pr
14561452
rescue StandardError => e
14571453
error_message = <<-MESSAGE
14581454
Error creating backmerge pull request: #{e.message}
1459-
- If this is not the first time you are running the release task, the backmerge PR for the version `#{version}` might have already been previously created.
1455+
If this is not the first time you are running the release task, the backmerge PR for the version `#{version}` might have already been previously created.
14601456
Please close any previous backmerge PR for `#{version}`, delete the previous merge branch, then run the release task again.
14611457
MESSAGE
14621458

0 commit comments

Comments
 (0)