admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
Deploy Sequoia runner, 🔪 Monterey
This commit is contained in:
Mike McQuaid 2024-09-13 08:36:53 +01:00 committed by GitHub
commit 51b9200f6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/github_runner_matrix.rb
View File

@ -120,8 +120,8 @@ class GitHubRunnerMatrix
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) }

8
Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb
View File

@ -31,11 +31,13 @@ RSpec.describe Homebrew::DevCmd::DetermineTestRunners do
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}-arm64"
next if macos_version > GitHubRunnerMatrix::NEWEST_HOMEBREW_CORE_INTEL_MACOS_RUNNER
out << "#{v}-x86_64"
out << "#{v}-arm64"
end
out << linux_runner

5
Library/Homebrew/test/github_runner_matrix_spec.rb
View File

@ -11,9 +11,8 @@ 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 { |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 @@ RSpec.describe GitHubRunnerMatrix do
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