Merge pull request #869 from MikeMcQuaid/test-bot-cleanup-all-taps

test-bot: cleanup all repositories.

1 files changed, 13 insertions, 6 deletions

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 87471b0f0..8474e1f88 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -688,13 +688,16 @@ module Homebrew
         git "reset", "--hard", "origin/master"
       end
       git "clean", "-ffdx"
-      unless @repository == HOMEBREW_REPOSITORY
-        HOMEBREW_REPOSITORY.cd do
+
+      Pathname.glob("{#{HOMEBREW_REPOSITORY},#{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"
           safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
         end
       end
+
       pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock"
       Dir.glob(pr_locks) { |lock| FileUtils.rm_rf lock }
     end
@@ -715,13 +718,17 @@ module Homebrew
         test "brew", "cleanup", "--prune=7"
         git "gc", "--auto"
         test "git", "clean", "-ffdx"
-        unless @repository == HOMEBREW_REPOSITORY
-          HOMEBREW_REPOSITORY.cd do
-            safe_system "git", "reset", "--hard"
+
+        Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" }
+
+        Pathname.glob("{#{HOMEBREW_REPOSITORY},#{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"
             safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
           end
         end
-        Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" }
 
         if ARGV.include? "--local"
           FileUtils.rm_rf ENV["HOMEBREW_HOME"]