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

test-bot: always brew install as a non-developer.

Browse Source 
Bored of dealing with the bottle conflicts errors here so I don't think
it's really worth working around.

Closes Homebrew/homebrew#40097.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2015-05-26 15:11:17 +01:00
parent e3ed1ccb15
commit ef08db539b
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,11 +418,7 @@ module Homebrew
CompilerSelector.select_for(formula) CompilerSelector.select_for(formula)
rescue CompilerSelectionError => e rescue CompilerSelectionError => e
unless installed_gcc unless installed_gcc
if @formulae.include? "gcc"
run_as_not_developer { test "brew", "install", "gcc" } run_as_not_developer { test "brew", "install", "gcc" }
else
test "brew", "install", "gcc"
end
installed_gcc = true installed_gcc = true
OS::Mac.clear_version_cache OS::Mac.clear_version_cache
retry retry
@ -452,11 +448,7 @@ module Homebrew
testable_dependents = dependents.select { |d| d.test_defined? && d.bottled? } testable_dependents = dependents.select { |d| d.test_defined? && d.bottled? }
if (deps | reqs).any? { |d| d.name == "mercurial" && d.build? } if (deps | reqs).any? { |d| d.name == "mercurial" && d.build? }
if @formulae.include? "mercurial"
run_as_not_developer { test "brew", "install", "mercurial" } run_as_not_developer { test "brew", "install", "mercurial" }
else
test "brew", "install", "mercurial"
end
end end
test "brew", "fetch", "--retry", *unchanged_dependencies unless unchanged_dependencies.empty? test "brew", "fetch", "--retry", *unchanged_dependencies unless unchanged_dependencies.empty?
@ -485,8 +477,8 @@ module Homebrew
# Don't care about e.g. bottle failures for dependencies. # Don't care about e.g. bottle failures for dependencies.
run_as_not_developer do run_as_not_developer do
test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty? test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty?
end
test "brew", "install", *install_args test "brew", "install", *install_args
end
install_passed = steps.last.passed? install_passed = steps.last.passed?
audit_args = [canonical_formula_name] audit_args = [canonical_formula_name]
audit_args << "--strict" if @added_formulae.include? formula_name audit_args << "--strict" if @added_formulae.include? formula_name
@ -520,7 +512,7 @@ module Homebrew
conflicts.each do |conflict| conflicts.each do |conflict|
test "brew", "unlink", conflict.name test "brew", "unlink", conflict.name
end end
test "brew", "install", dependent.name run_as_not_developer { test "brew", "install", dependent.name }
next if steps.last.failed? next if steps.last.failed?
end end
if dependent.installed? if dependent.installed?
@ -533,7 +525,7 @@ module Homebrew
if formula.devel && formula.stable? && !ARGV.include?('--HEAD') \ if formula.devel && formula.stable? && !ARGV.include?('--HEAD') \
&& satisfied_requirements?(formula, :devel) && satisfied_requirements?(formula, :devel)
test "brew", "fetch", "--retry", "--devel", *formula_fetch_options test "brew", "fetch", "--retry", "--devel", *formula_fetch_options
test "brew", "install", "--devel", "--verbose", canonical_formula_name run_as_not_developer { test "brew", "install", "--devel", "--verbose", dependent.name }
devel_install_passed = steps.last.passed? devel_install_passed = steps.last.passed?
test "brew", "audit", "--devel", *audit_args test "brew", "audit", "--devel", *audit_args
if devel_install_passed if devel_install_passed