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

Merge pull request #921 from MikeMcQuaid/test-bot-no-clean-taps

Browse Source 
test-bot: don't try to `git clean` any taps.
This commit is contained in:
Mike McQuaid 2016-09-11 14:40:09 +01:00 committed by GitHub
commit a54ee597d0
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,18 +724,15 @@ module Homebrew
end end
end end
def cleanup_before def cleanup_git
@category = __method__
return unless ARGV.include? "--cleanup"
git "gc", "--auto" git "gc", "--auto"
git "stash" test "git", "clean", "-ffdx", "--exclude=Library/Taps"
git "am", "--abort"
git "rebase", "--abort" Tap.names.each do |tap|
unless ARGV.include? "--no-pull" next if tap == "homebrew/core"
git "checkout", "-f", "master" next if tap == @tap.to_s
git "reset", "--hard", "origin/master" safe_system "brew", "untap", tap
end end
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
@ -752,6 +749,20 @@ module Homebrew
safe_system "git", "reset", "--hard", "origin/master" safe_system "git", "reset", "--hard", "origin/master"
end end
end end
end
def cleanup_before
@category = __method__
return unless ARGV.include? "--cleanup"
git "stash"
git "am", "--abort"
git "rebase", "--abort"
unless ARGV.include? "--no-pull"
git "checkout", "-f", "master"
git "reset", "--hard", "origin/master"
end
cleanup_git
pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock" pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock"
Dir.glob(pr_locks) { |lock| FileUtils.rm_rf lock } Dir.glob(pr_locks) { |lock| FileUtils.rm_rf lock }
@ -771,26 +782,8 @@ module Homebrew
git "reset", "--hard", "origin/master" git "reset", "--hard", "origin/master"
git "stash", "pop" git "stash", "pop"
test "brew", "cleanup", "--prune=7" test "brew", "cleanup", "--prune=7"
git "gc", "--auto"
test "git", "clean", "-ffdx", "--exclude=Library/Taps/homebrew/homebrew-core"
Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" } cleanup_git
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
git_repo.cd do
safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
end
end
if ARGV.include? "--local" if ARGV.include? "--local"
FileUtils.rm_rf ENV["HOMEBREW_HOME"] FileUtils.rm_rf ENV["HOMEBREW_HOME"]