brew-test-bot: remember to pull the PR.

This commit is contained in:
Mike McQuaid 2013-12-10 21:41:09 +00:00
parent 418b751aca
commit 1d1bad98b7

View File

@ -419,11 +419,17 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload'
ARGV << '--verbose' ARGV << '--verbose'
copied = 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 exit unless copied
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" safe_system "brew bottle --merge --write *.bottle*.rb"
remote = "git@github.com:BrewTestBot/homebrew.git" remote = "git@github.com:BrewTestBot/homebrew.git"
pr = ENV['UPSTREAM_PULL_REQUEST']
number = ENV['UPSTREAM_BUILD_NUMBER']
tag = pr ? "pr-#{pr}" : "testing-#{number}" tag = pr ? "pr-#{pr}" : "testing-#{number}"
safe_system "git push --force #{remote} :refs/tags/#{tag}" safe_system "git push --force #{remote} :refs/tags/#{tag}"