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

brew-test-bot: handle changed formulae deps.

Browse Source 
If both a formula and its dependencies are changed in a single pull
request it'll fail because the bottle block may no longer be correct.

Handle this case by ignoring bottle pour failures and fetching the
source packages instead of bottles.
This commit is contained in:
Mike McQuaid 2014-07-29 11:08:18 +02:00
parent 8ca8ec3993
commit 8ad07144f7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Contributions/cmd/brew-test-bot.rb
View File

@ -297,6 +297,8 @@ class Test
test "brew", "uses", formula test "brew", "uses", formula
dependencies = `brew deps #{formula}`.split("\n") dependencies = `brew deps #{formula}`.split("\n")
dependencies -= `brew list`.split("\n") dependencies -= `brew list`.split("\n")
unchanged_dependencies = dependencies - @formulae
changed_dependences = dependencies - unchanged_dependencies
formula_object = Formulary.factory(formula) formula_object = Formulary.factory(formula)
return unless satisfied_requirements?(formula_object, :stable) return unless satisfied_requirements?(formula_object, :stable)
@ -315,7 +317,8 @@ class Test
return return
end end
test "brew", "fetch", "--retry", *dependencies unless dependencies.empty? test "brew", "fetch", "--retry", *unchanged_dependencies unless unchanged_dependencies.empty?
test "brew", "fetch", "--retry", "--build-from-source", *changed_dependences unless changed_dependences.empty?
formula_fetch_options = [] formula_fetch_options = []
formula_fetch_options << "--build-bottle" unless ARGV.include? "--no-bottle" formula_fetch_options << "--build-bottle" unless ARGV.include? "--no-bottle"
formula_fetch_options << "--force" if ARGV.include? "--cleanup" formula_fetch_options << "--force" if ARGV.include? "--cleanup"
@ -326,7 +329,10 @@ class Test
install_args << "--build-bottle" unless ARGV.include? "--no-bottle" install_args << "--build-bottle" unless ARGV.include? "--no-bottle"
install_args << "--HEAD" if ARGV.include? "--HEAD" install_args << "--HEAD" if ARGV.include? "--HEAD"
install_args << formula install_args << formula
# Don't care about e.g. bottle failures for dependencies.
ENV["HOMEBREW_DEVELOPER"] = nil
test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty? test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty?
ENV["HOMEBREW_DEVELOPER"] = "1"
test "brew", "install", *install_args test "brew", "install", *install_args
install_passed = steps.last.passed? install_passed = steps.last.passed?
test "brew", "audit", formula test "brew", "audit", formula