Merge pull request #1252 from Homebrew/revert-1250-untap-unneeded-taps

Homebrew · Oct 2, 2024 · c82dec0 · c82dec0
2 parents d2a5e56 + d527441
commit c82dec0
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/lib/tests/cleanup_before.rb b/lib/tests/cleanup_before.rb
@@ -13,9 +13,7 @@ def run!(args:)
 
         Pathname.glob("*.bottle*.*").each(&:unlink)
 
-        on_github_hosted_runner = ENV["HOMEBREW_GITHUB_ACTIONS"].present? &&
-                                  ENV["GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED"].blank?
-        if on_github_hosted_runner
+        if ENV["HOMEBREW_GITHUB_ACTIONS"] && !ENV["GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED"]
           # minimally fix brew doctor failures (a full clean takes ~5m)
           if OS.linux?
             # brew doctor complains
@@ -50,11 +48,6 @@ def run!(args:)
         cleanup_shared
 
         installed_taps = Tap.select(&:installed?).map(&:name)
-        if on_github_hosted_runner && tap.to_s == CoreTap.instance.name
-          (installed_taps - REQUIRED_TAPS).each do |tap|
-            test "brew", "untap", tap
-          end
-        end
         (REQUIRED_TAPS - installed_taps).each do |tap|
           test "brew", "tap", tap
         end