aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Contributions/cmd
diff options
context:
space:
mode:
authorMike McQuaid2013-12-10 21:41:09 +0000
committerMike McQuaid2013-12-10 21:41:09 +0000
commit1d1bad98b7c77092262f68870cfcfdba2e8a4380 (patch)
treebafa68df101a134924b3d30dab425cf62315c5a6 /Library/Contributions/cmd
parent418b751aca2da41be58263e1f847d2c315070923 (diff)
downloadbrew-1d1bad98b7c77092262f68870cfcfdba2e8a4380.tar.bz2
brew-test-bot: remember to pull the PR.
Diffstat (limited to 'Library/Contributions/cmd')
-rwxr-xr-xLibrary/Contributions/cmd/brew-test-bot.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index 919b81ab5..aeb7606c1 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -419,11 +419,17 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload'
ARGV << '--verbose'
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"
pr = ENV['UPSTREAM_PULL_REQUEST']
number = ENV['UPSTREAM_BUILD_NUMBER']
+
+ if ARGV.include? '--ci-pr-upload'
+ safe_system "brew pull --clean #{pr}"
+ end
+
+ safe_system "brew bottle --merge --write *.bottle*.rb"
+
+ remote = "git@github.com:BrewTestBot/homebrew.git"
tag = pr ? "pr-#{pr}" : "testing-#{number}"
safe_system "git push --force #{remote} :refs/tags/#{tag}"