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

test-bot: assume Ruby 2.

Browse Source
This commit is contained in:
Mike McQuaid 2016-08-16 17:00:38 +01:00
parent 7c278319ed
commit 3ae663c013
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/dev-cmd/test-bot.rb
View File

@ -421,8 +421,7 @@ module Homebrew
def setup def setup
@category = __method__ @category = __method__
return if ARGV.include? "--skip-setup" return if ARGV.include? "--skip-setup"
if !ENV["TRAVIS"] && ENV["HOMEBREW_RUBY"] != "1.8.7" && if !ENV["TRAVIS"] && HOMEBREW_PREFIX.to_s == "/usr/local"
HOMEBREW_PREFIX.to_s == "/usr/local"
test "brew", "doctor" test "brew", "doctor"
end end
test "brew", "--env" test "brew", "--env"
@ -661,12 +660,9 @@ module Homebrew
return if @skip_homebrew return if @skip_homebrew
if @tap.nil? if @tap.nil?
tests_args = [] tests_args = ["--official-cmd-taps"]
tests_args_no_compat = [] tests_args_no_compat = []
if RUBY_TWO tests_args_no_compat << "--coverage" if ARGV.include?("--coverage")
tests_args << "--official-cmd-taps"
tests_args_no_compat << "--coverage" if ARGV.include?("--coverage")
end
test "brew", "tests", *tests_args test "brew", "tests", *tests_args
test "brew", "tests", "--generic", *tests_args test "brew", "tests", "--generic", *tests_args
test "brew", "tests", "--no-compat", *tests_args_no_compat test "brew", "tests", "--no-compat", *tests_args_no_compat
@ -699,11 +695,7 @@ module Homebrew
HOMEBREW_REPOSITORY.cd do HOMEBREW_REPOSITORY.cd do
safe_system "git", "checkout", "-f", "master" safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master" safe_system "git", "reset", "--hard", "origin/master"
# This will uninstall all formulae, as long as safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
# HOMEBREW_REPOSITORY == HOMEBREW_PREFIX, which is true on the test bots
unless ENV["HOMEBREW_RUBY"] == "1.8.7"
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
end
end end
end end
pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock" pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock"
@ -921,7 +913,7 @@ module Homebrew
ENV["HOMEBREW_DEVELOPER"] = "1" ENV["HOMEBREW_DEVELOPER"] = "1"
ENV["HOMEBREW_SANDBOX"] = "1" ENV["HOMEBREW_SANDBOX"] = "1"
ENV["HOMEBREW_RUBY_MACHO"] = "1" if RUBY_TWO ENV["HOMEBREW_RUBY_MACHO"] = "1"
ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_NO_EMOJI"] = "1"
ENV["HOMEBREW_FAIL_LOG_LINES"] = "150" ENV["HOMEBREW_FAIL_LOG_LINES"] = "150"
ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1" ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1"