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

Merge pull request #884 from MikeMcQuaid/test-bot-clean-change-again

Browse Source 
test-bot: tweak cleaning behaviour again.
This commit is contained in:
Mike McQuaid 2016-09-06 12:11:58 +01:00 committed by GitHub
commit 069d5f00bc
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,9 @@ module Homebrew
raise if e.tap.installed? raise if e.tap.installed?
test "brew", "tap", e.tap.name test "brew", "tap", e.tap.name
retry unless steps.last.failed? retry unless steps.last.failed?
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError => e
onoe e
puts e.backtrace
end end
def git(*args) def git(*args)
@ -689,7 +691,15 @@ module Homebrew
end end
git "clean", "-ffdx" git "clean", "-ffdx"
Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo| unless @repository == HOMEBREW_REPOSITORY
HOMEBREW_REPOSITORY.cd do
safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
end
end
Pathname.glob("#{HOMEBREW_LIBRARY}/Taps/*/*").each do |git_repo|
next if @repository == git_repo next if @repository == git_repo
git_repo.cd do git_repo.cd do
safe_system "git", "checkout", "-f", "master" safe_system "git", "checkout", "-f", "master"
@ -720,7 +730,15 @@ module Homebrew
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" }
Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo| unless @repository == HOMEBREW_REPOSITORY
HOMEBREW_REPOSITORY.cd do
safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
end
end
Pathname.glob("#{HOMEBREW_LIBRARY}/Taps/*/*").each do |git_repo|
next if @repository == git_repo next if @repository == git_repo
git_repo.cd do git_repo.cd do
safe_system "git", "checkout", "-f", "master" safe_system "git", "checkout", "-f", "master"