From 0a098ae55d5ed08de255e3fe69f49ec04d403cd2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid <mike@mikemcquaid.com> Date: Mon, 5 Sep 2016 20:17:49 +0100 Subject: [PATCH] test-bot: never cleanup homebrew/core. Otherwise weird things happen and formulae can't be found. --- Library/Homebrew/dev-cmd/test-bot.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 4295639d22..1a495d04cb 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -687,7 +687,7 @@ module Homebrew git "checkout", "-f", "master" git "reset", "--hard", "origin/master" end - git "clean", "-ffdx" + git "clean", "-ffdx", "--exclude=/Library/Taps/" Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo| next if @repository == git_repo @@ -717,16 +717,14 @@ module Homebrew git "stash", "pop" test "brew", "cleanup", "--prune=7" git "gc", "--auto" - test "git", "clean", "-ffdx" - - Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" } + test "git", "clean", "-ffdx", "--exclude=/Library/Taps/homebrew/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/" + safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/homebrew/homebrew-core" end end -- GitLab