diff options
| author | Mike McQuaid | 2016-09-04 20:59:50 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-04 20:59:50 +0100 |
| commit | 8e98a0a198551f19696b3c09469fcbb1e1223f73 (patch) | |
| tree | 45a0d537f4666c9dc1ac8acbc1eccda27ca2f2ea /Library | |
| parent | 2e5e9286f7d8e4ede289d8839c027aeef06f303c (diff) | |
| parent | 3acaecca8b74e5ee66d3f2eff35fddf1e794df30 (diff) | |
| download | brew-8e98a0a198551f19696b3c09469fcbb1e1223f73.tar.bz2 | |
Merge pull request #872 from MikeMcQuaid/test-bot-keep-old
test-bot: use UPSTREAM_BOTTLE_KEEP_OLD.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/dev-cmd/test-bot.rb | 6 |
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}" |