Merge pull request #18314 from Homebrew/sequoia-runner-for-bottled-fo…

…rmulae Deploy Sequoia runner, 🔪 Monterey
Homebrew · Sep 13, 2024 · 51b9200 · 51b9200
2 parents fd7f2bb + 51c4421
commit 51b9200
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Library/Homebrew/github_runner_matrix.rb b/Library/Homebrew/github_runner_matrix.rb
@@ -120,8 +120,8 @@ def create_runner(platform, arch, spec, macos_version = nil)
     runner.freeze
   end
 
-  NEWEST_HOMEBREW_CORE_MACOS_RUNNER = :sonoma
-  OLDEST_HOMEBREW_CORE_MACOS_RUNNER = :monterey
+  NEWEST_HOMEBREW_CORE_MACOS_RUNNER = :sequoia
+  OLDEST_HOMEBREW_CORE_MACOS_RUNNER = :ventura
   NEWEST_HOMEBREW_CORE_INTEL_MACOS_RUNNER = :sonoma
 
   sig { params(macos_version: MacOSVersion).returns(T::Boolean) }

diff --git a/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb b/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb
@@ -31,11 +31,13 @@ def get_runners(file)
     out = []
     MacOSVersion::SYMBOLS.each_value do |v|
       macos_version = MacOSVersion.new(v)
-      next if macos_version < :monterey
-      next if macos_version > :sonoma
+      next if macos_version < GitHubRunnerMatrix::OLDEST_HOMEBREW_CORE_MACOS_RUNNER
+      next if macos_version > GitHubRunnerMatrix::NEWEST_HOMEBREW_CORE_MACOS_RUNNER
 
-      out << "#{v}-x86_64"
       out << "#{v}-arm64"
+      next if macos_version > GitHubRunnerMatrix::NEWEST_HOMEBREW_CORE_INTEL_MACOS_RUNNER
+
+      out << "#{v}-x86_64"
     end
 
     out << linux_runner

diff --git a/Library/Homebrew/test/github_runner_matrix_spec.rb b/Library/Homebrew/test/github_runner_matrix_spec.rb
@@ -11,9 +11,8 @@
     allow(ENV).to receive(:fetch).with("GITHUB_RUN_ID").and_return("12345")
   end
 
-  # FIXME: Avoid changing this every time we change Homebrew/core CI runner macOS versions.
   let(:newest_supported_macos) do
-    MacOSVersion::SYMBOLS.find { |k, _| k == :sonoma }
+    MacOSVersion::SYMBOLS.find { |k, _| k == described_class::NEWEST_HOMEBREW_CORE_MACOS_RUNNER }
   end
 
   let(:testball) { TestRunnerFormula.new(Testball.new) }
@@ -136,7 +135,7 @@
 
           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", "macOS #{v}-arm64", "macOS #{v}-x86_64"])
+          expect(get_runner_names(runner_matrix).sort).to eq(["Linux", "macOS #{v}-arm64"])
         end
       end
     end