From c51bb196d1b9559916e2a38c257f7b8e1d50fa19 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:20:08 +0800 Subject: [PATCH] tests: update `determine-test-runners` tests We've decoupled the macOS versions there from `MacOSVersion#supported_release?`, so these tests need updating. --- Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb | 3 ++- Library/Homebrew/test/github_runner_matrix_spec.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb b/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb index 32cd05b0c1..b137ce6d32 100644 --- a/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb +++ b/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb @@ -31,7 +31,8 @@ RSpec.describe Homebrew::DevCmd::DetermineTestRunners do out = [] MacOSVersion::SYMBOLS.each_value do |v| macos_version = MacOSVersion.new(v) - next if macos_version.unsupported_release? + next if macos_version < :monterey + next if macos_version > :sonoma out << "#{v}-x86_64" out << "#{v}-arm64" diff --git a/Library/Homebrew/test/github_runner_matrix_spec.rb b/Library/Homebrew/test/github_runner_matrix_spec.rb index 99f457e01e..ab4850ff71 100644 --- a/Library/Homebrew/test/github_runner_matrix_spec.rb +++ b/Library/Homebrew/test/github_runner_matrix_spec.rb @@ -11,8 +11,9 @@ RSpec.describe GitHubRunnerMatrix do 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 { |_, v| !MacOSVersion.new(v).prerelease? } + MacOSVersion::SYMBOLS.find { |k, _| k == :sonoma } end let(:testball) { TestRunnerFormula.new(Testball.new) }