aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2013-12-10 21:32:29 +0000
committerMike McQuaid2013-12-10 21:32:29 +0000
commit418b751aca2da41be58263e1f847d2c315070923 (patch)
tree74b8365266105c8fe7e96f53c9ed1fee536a268c /Library
parent9392e632bce0385d44c67ef81d5b60de35d255ea (diff)
downloadbrew-418b751aca2da41be58263e1f847d2c315070923.tar.bz2
brew-test-bot: only merge bottles if copy succeeds.
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/Contributions/cmd/brew-test-bot.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index b99da09cf..919b81ab5 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -417,7 +417,8 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload'
raise "Missing Jenkins variables!" unless jenkins and job and id
ARGV << '--verbose'
- safe_system "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ."
+ copied = system "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ."
+ exit unless copied
safe_system "brew bottle --merge --write *.bottle*.rb"
remote = "git@github.com:BrewTestBot/homebrew.git"
@@ -432,7 +433,7 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload'
safe_system "rsync #{options} *.bottle.tar.gz #{url}"
safe_system "git tag --force #{tag}"
safe_system "git push --force #{remote} refs/tags/#{tag}"
- exit 0
+ exit
end
tests = []