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

Merge pull request #919 from MikeMcQuaid/test-bot-no-more-untap-core

Browse Source 
test-bot: try again to fix homebrew/core untap.
This commit is contained in:
Mike McQuaid 2016-09-11 12:57:39 +01:00 committed by GitHub
commit 6c0072d0f4
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,16 +296,10 @@ module Homebrew
test "brew", "tap", e.tap.name test "brew", "tap", e.tap.name
retry unless steps.last.failed? retry unless steps.last.failed?
onoe e onoe e
puts e.backtrace puts e.backtrace if ARGV.debug?
rescue FormulaUnavailableError => e rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError => e
raise if CoreTap.instance.installed?
test "brew", "tap", CoreTap.instance.name
retry unless steps.last.failed?
onoe e onoe e
puts e.backtrace puts e.backtrace if ARGV.debug?
rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError => e
onoe e
puts e.backtrace
end end
def git(*args) def git(*args)
@ -741,13 +735,13 @@ module Homebrew
git "checkout", "-f", "master" git "checkout", "-f", "master"
git "reset", "--hard", "origin/master" git "reset", "--hard", "origin/master"
end end
git "clean", "-ffdx" git "clean", "-ffdx", "--exclude=Library/Taps/homebrew/homebrew-core"
unless @repository == HOMEBREW_REPOSITORY unless @repository == HOMEBREW_REPOSITORY
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"
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/" safe_system "git", "clean", "-ffdx", "--exclude=Library/Taps"
end end
end end
@ -778,7 +772,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" test "git", "clean", "-ffdx", "--exclude=Library/Taps/homebrew/homebrew-core"
Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" } Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" }
@ -786,7 +780,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"
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/" safe_system "git", "clean", "-ffdx", "--exclude=Library/Taps"
end end
end end