Merge pull request #22420 from ivan-digital/fix-macos-only-versioned

test_runner_formula: treat versioned macOS deps as macOS-only

Author: MikeMcQuaid

Library/Homebrew/test/github_runner_matrix_spec.rb

@@ -141,15 +141,15 @@
       end
 
       context "when testing formulae require a macOS version" do
-        it "activates the Linux runners and suitable macOS runners" do
+        it "activates only the suitable macOS runners" do
           _, v = newest_supported_macos
           runner_matrix = klass.new([testball_depender_newest], [],
                                     all_supported:    false,
                                     dependent_matrix: false)
 
           expect(runner_matrix.runners.all?(&:active)).to be(false)
           expect(runner_matrix.runners.any?(&:active)).to be(true)
-          expect(get_runner_names(runner_matrix).sort).to eq(["Linux arm64", "Linux x86_64", "macOS #{v}-arm64"])
+          expect(get_runner_names(runner_matrix).sort).to eq(["macOS #{v}-arm64"])
         end
       end
     end

Library/Homebrew/test/test_runner_formula_spec.rb

@@ -65,8 +65,8 @@
     end
 
     context "when a formula requires only a minimum version of macOS" do
-      it "returns false" do
-        expect(klass.new(needs_modern_compiler).macos_only?).to be(false)
+      it "returns true" do
+        expect(klass.new(needs_modern_compiler).macos_only?).to be(true)
       end
     end
   end
@@ -119,13 +119,13 @@
         expect(klass.new(linux_kernel_requirer).linux_compatible?).to be(true)
         expect(klass.new(old_non_portable_software).linux_compatible?).to be(true)
         expect(klass.new(fancy_new_software).linux_compatible?).to be(true)
-        expect(klass.new(needs_modern_compiler).linux_compatible?).to be(true)
       end
     end
 
     context "when a formula is not compatible with Linux" do
       it "returns false" do
         expect(klass.new(xcode_helper).linux_compatible?).to be(false)
+        expect(klass.new(needs_modern_compiler).linux_compatible?).to be(false)
       end
     end
   end

Library/Homebrew/test_runner_formula.rb

@@ -25,22 +25,22 @@ def initialize(formula, eval_all: Homebrew::EnvConfig.eval_all?)
 
   sig { returns(T::Boolean) }
   def macos_only?
-    formula.requirements.any? { |r| r.is_a?(MacOSRequirement) && !r.version_specified? }
+    !linux_compatible?
   end
 
   sig { returns(T::Boolean) }
   def macos_compatible?
-    !linux_only?
+    formula.supports_macos?
   end
 
   sig { returns(T::Boolean) }
   def linux_only?
-    formula.requirements.any?(LinuxRequirement)
+    !macos_compatible?
   end
 
   sig { returns(T::Boolean) }
   def linux_compatible?
-    !macos_only?
+    formula.supports_linux?
   end
 
   sig { returns(T::Boolean) }