aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-09-04 20:07:35 +0100
committerMike McQuaid2016-09-04 20:07:37 +0100
commit3acaecca8b74e5ee66d3f2eff35fddf1e794df30 (patch)
tree45a0d537f4666c9dc1ac8acbc1eccda27ca2f2ea /Library
parent2e5e9286f7d8e4ede289d8839c027aeef06f303c (diff)
downloadbrew-3acaecca8b74e5ee66d3f2eff35fddf1e794df30.tar.bz2
test-bot: use UPSTREAM_BOTTLE_KEEP_OLD.
This is set by Jenkins to indicate a downstream bottle upload job needs to use `brew bottle --keep-old`.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/dev-cmd/test-bot.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 8474e1f88..4295639d2 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -857,7 +857,11 @@ module Homebrew
safe_system "brew", "pull", "--clean", pull_pr
end
- system "brew", "bottle", "--merge", "--write", *json_files
+ if ENV["UPSTREAM_BOTTLE_KEEP_OLD"]
+ system "brew", "bottle", "--merge", "--write", "--keep-old", *json_files
+ else
+ system "brew", "bottle", "--merge", "--write", *json_files
+ end
remote = "git@github.com:BrewTestBot/homebrew-#{tap.repo}.git"
git_tag = pr ? "pr-#{pr}" : "testing-#{number}"