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

test-bot: more Jenkins Mavericks 1.8.7 fixes.

Browse Source
This commit is contained in:
Mike McQuaid 2015-12-07 14:08:55 +00:00
parent f7d3710d12
commit d603c03aa3
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,7 @@ module Homebrew
def setup def setup
@category = __method__ @category = __method__
return if ARGV.include? "--skip-setup" return if ARGV.include? "--skip-setup"
test "brew", "doctor" unless ENV["TRAVIS"] test "brew", "doctor" if !ENV["TRAVIS"] && ENV["HOMEBREW_RUBY"] != "1.8.7"
test "brew", "--env" test "brew", "--env"
test "brew", "config" test "brew", "config"
end end
@ -655,16 +655,10 @@ module Homebrew
def cleanup_after def cleanup_after
@category = __method__ @category = __method__
checkout_args = []
if ARGV.include? "--cleanup"
test "git", "clean", "-ffdx"
checkout_args << "-f"
end
checkout_args << @start_branch
if @start_branch && !@start_branch.empty? && \ if @start_branch && !@start_branch.empty? && \
(ARGV.include?("--cleanup") || @url || @hash) (ARGV.include?("--cleanup") || @url || @hash)
checkout_args = [@start_branch]
checkout_args << "-f" if ARGV.include? "--cleanup"
test "git", "checkout", *checkout_args test "git", "checkout", *checkout_args
end end
@ -673,6 +667,7 @@ module Homebrew
git "stash", "pop" git "stash", "pop"
test "brew", "cleanup", "--prune=7" test "brew", "cleanup", "--prune=7"
git "gc", "--auto" git "gc", "--auto"
test "git", "clean", "-ffdx"
if ARGV.include? "--local" if ARGV.include? "--local"
FileUtils.rm_rf ENV["HOMEBREW_HOME"] FileUtils.rm_rf ENV["HOMEBREW_HOME"]
FileUtils.rm_rf ENV["HOMEBREW_LOGS"] FileUtils.rm_rf ENV["HOMEBREW_LOGS"]