litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-272 Refactor scripts: get_permission_and_go()

Browse source
This commit is contained in:
j2blake 2013-09-03 17:07:31 -04:00
parent 419af234c4
commit 508f88a7c5
7 changed files with 52 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
utilities/releaseScripts/7_merge_to_master.rb
View file

@ -47,18 +47,10 @@ begin
raise BadState.new("Branch #{branch} doesn't exist in VIVO.") unless branch_exists?(vivo_path, branch)
raise BadState.new("Branch #{branch} doesn't exist in Vitro.") unless branch_exists?(vitro_path, branch)
puts
yn = prompt("OK to merge the #{tag} tags to the master branches? (y/n)")
if yn.downcase == 'y'
puts
get_permission_and_go("OK to merge the #{tag} tags to the master branches?") do
puts "Merging tags"
merge_branch_to_master(branch, tag, message, vivo_path)
merge_branch_to_master(branch, tag, message, vitro_path)
puts
else
puts
puts "OK - forget it."
puts
end
rescue BadState
puts "#{$!.message} - Aborting."