Merge pull request #872 from MikeMcQuaid/test-bot-keep-old

test-bot: use UPSTREAM_BOTTLE_KEEP_OLD.
This commit is contained in:
Mike McQuaid 2016-09-04 20:59:50 +01:00 committed by GitHub
commit 8e98a0a198

View File

@ -857,7 +857,11 @@ module Homebrew
safe_system "brew", "pull", "--clean", pull_pr safe_system "brew", "pull", "--clean", pull_pr
end 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" remote = "git@github.com:BrewTestBot/homebrew-#{tap.repo}.git"
git_tag = pr ? "pr-#{pr}" : "testing-#{number}" git_tag = pr ? "pr-#{pr}" : "testing-#{number}"