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

github_runner_matrix: set timeout on macOS

Browse Source 
This will allow us to set a slightly longer timeout on Intel Big Sur,
which is useful because the Intel Big Sur runner often exceeds our short
time limit by itself.
This commit is contained in:
Carlo Cabrera 2023-04-25 14:42:36 +08:00
parent 23a89d9263
commit 3baacbbc72
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/github_runner_matrix.rb
View File

@ -15,7 +15,7 @@ class GitHubRunnerMatrix
RunnerSpec = T.type_alias { T.any(LinuxRunnerSpec, MacOSRunnerSpec) } RunnerSpec = T.type_alias { T.any(LinuxRunnerSpec, MacOSRunnerSpec) }
private_constant :RunnerSpec private_constant :RunnerSpec
MacOSRunnerSpecHash = T.type_alias { { name: String, runner: String, cleanup: T::Boolean } } MacOSRunnerSpecHash = T.type_alias { { name: String, runner: String, timeout: Integer, cleanup: T::Boolean } }
private_constant :MacOSRunnerSpecHash private_constant :MacOSRunnerSpecHash
LinuxRunnerSpecHash = T.type_alias do LinuxRunnerSpecHash = T.type_alias do
@ -110,6 +110,7 @@ class GitHubRunnerMatrix
github_run_id = ENV.fetch("GITHUB_RUN_ID") github_run_id = ENV.fetch("GITHUB_RUN_ID")
github_run_attempt = ENV.fetch("GITHUB_RUN_ATTEMPT") github_run_attempt = ENV.fetch("GITHUB_RUN_ATTEMPT")
timeout = ENV.fetch("HOMEBREW_MACOS_TIMEOUT").to_i
ephemeral_suffix = +"-#{github_run_id}-#{github_run_attempt}" ephemeral_suffix = +"-#{github_run_id}-#{github_run_attempt}"
ephemeral_suffix << "-deps" if @dependent_matrix ephemeral_suffix << "-deps" if @dependent_matrix
ephemeral_suffix.freeze ephemeral_suffix.freeze
@ -118,9 +119,16 @@ class GitHubRunnerMatrix
macos_version = OS::Mac::Version.new(version) macos_version = OS::Mac::Version.new(version)
next if macos_version.unsupported_release? next if macos_version.unsupported_release?
# Intel Big Sur is a bit slower than the other runners,
# so give it a little bit more time. The comparison below
# should be `==`, but it returns typecheck errors.
runner_timeout = timeout
runner_timeout += 30 if macos_version <= :big_sur
spec = MacOSRunnerSpec.new( spec = MacOSRunnerSpec.new(
name: "macOS #{version}-x86_64", name: "macOS #{version}-x86_64",
runner: "#{version}#{ephemeral_suffix}", runner: "#{version}#{ephemeral_suffix}",
timeout: runner_timeout,
cleanup: false, cleanup: false,
) )
@runners << create_runner(:macos, :x86_64, spec, macos_version) @runners << create_runner(:macos, :x86_64, spec, macos_version)
@ -136,7 +144,7 @@ class GitHubRunnerMatrix
["#{version}-arm64", true] ["#{version}-arm64", true]
end end
spec = MacOSRunnerSpec.new(name: "macOS #{version}-arm64", runner: runner, cleanup: cleanup) spec = MacOSRunnerSpec.new(name: "macOS #{version}-arm64", runner: runner, timeout: timeout, cleanup: cleanup)
@runners << create_runner(:macos, :arm64, spec, macos_version) @runners << create_runner(:macos, :arm64, spec, macos_version)
end end

4
Library/Homebrew/macos_runner_spec.rb
View File

@ -6,13 +6,15 @@ class MacOSRunnerSpec < T::Struct
const :name, String const :name, String
const :runner, String const :runner, String
const :timeout, Integer
const :cleanup, T::Boolean const :cleanup, T::Boolean
sig { returns({ name: String, runner: String, cleanup: T::Boolean }) } sig { returns({ name: String, runner: String, timeout: Integer, cleanup: T::Boolean }) }
def to_h def to_h
{ {
name: name, name: name,
runner: runner, runner: runner,
timeout: timeout,
cleanup: cleanup, cleanup: cleanup,
} }
end end