From c247a5b462254acca054bf0b2663ae6fbe217a38 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Thu, 15 Oct 2015 15:00:05 +0800 Subject: [PATCH] test-bot: merge formula's bottle before test Fixes the bug described in https://github.com/Homebrew/homebrew-science/pull/2866#issuecomment-148298146 --- Library/Homebrew/cmd/test-bot.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index e228683a65..0be845b623 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