diff options
| author | Xu Cheng | 2015-10-15 15:00:05 +0800 |
|---|---|---|
| committer | Mike McQuaid | 2015-10-15 09:05:51 +0100 |
| commit | c247a5b462254acca054bf0b2663ae6fbe217a38 (patch) | |
| tree | 80784978956a5fb073c5b60e612e5d032e7c5b6d /Library | |
| parent | 1da05836342f0ee0cae541575378b46945c146f7 (diff) | |
| download | brew-c247a5b462254acca054bf0b2663ae6fbe217a38.tar.bz2 | |
test-bot: merge formula's bottle before test
Fixes the bug described in
https://github.com/Homebrew/homebrew-science/pull/2866#issuecomment-148298146
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index e228683a6..0be845b62 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -590,6 +590,11 @@ module Homebrew if bottle_step.passed? && bottle_step.has_output? bottle_filename = bottle_step.output.gsub(/.*(\.\/\S+#{bottle_native_regex}).*/m, '\1') + bottle_rb_filename = bottle_filename.gsub(/\.(\d+\.)?tar\.gz$/, ".rb") + bottle_merge_args = ["--merge", "--write", "--no-commit", bottle_rb_filename] + bottle_merge_args << "--tap=#{@tap}" if @tap + bottle_merge_args << "--keep-old" if ARGV.include? "--keep-old" + test "brew", "bottle", *bottle_merge_args test "brew", "uninstall", "--force", canonical_formula_name if unchanged_build_dependencies.any? test "brew", "uninstall", "--force", *unchanged_build_dependencies |