admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

test-bot: merge formula's bottle before test

Browse Source 
Fixes the bug described in
https://github.com/Homebrew/homebrew-science/pull/2866#issuecomment-148298146
This commit is contained in:
Xu Cheng 2015-10-15 15:00:05 +08:00 committed by Mike McQuaid
parent 1da0583634
commit c247a5b462
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/cmd/test-bot.rb
View File

@ -590,6 +590,11 @@ module Homebrew
if bottle_step.passed? && bottle_step.has_output? if bottle_step.passed? && bottle_step.has_output?
bottle_filename = bottle_filename =
bottle_step.output.gsub(/.*(\.\/\S+#{bottle_native_regex}).*/m, '\1') 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 test "brew", "uninstall", "--force", canonical_formula_name
if unchanged_build_dependencies.any? if unchanged_build_dependencies.any?
test "brew", "uninstall", "--force", *unchanged_build_dependencies test "brew", "uninstall", "--force", *unchanged_build_dependencies