diff options
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/Contributions/cmd/brew-test-bot.rb | 10 |
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}" |