Merge pull request #883 from MikeMcQuaid/test-bot-git-clean-less
test-bot: git clean less in cleanup_*.
This commit is contained in:
commit
f64befdd78
@ -687,14 +687,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", "--exclude=/Library/Taps/"
|
git "clean", "-ffdx"
|
||||||
|
|
||||||
Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo|
|
Pathname.glob("{#{HOMEBREW_REPOSITORY},#{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"
|
||||||
safe_system "git", "reset", "--hard", "origin/master"
|
safe_system "git", "reset", "--hard", "origin/master"
|
||||||
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -717,14 +716,15 @@ 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", "--exclude=/Library/Taps/homebrew/homebrew-core"
|
test "git", "clean", "-ffdx"
|
||||||
|
|
||||||
|
Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" }
|
||||||
|
|
||||||
Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo|
|
Pathname.glob("{#{HOMEBREW_REPOSITORY},#{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"
|
||||||
safe_system "git", "reset", "--hard", "origin/master"
|
safe_system "git", "reset", "--hard", "origin/master"
|
||||||
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/homebrew/homebrew-core"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user