mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
Merge pull request #17280 from Homebrew/timeout-values
This commit is contained in:
commit
ff83a4fd7f
@ -67,6 +67,7 @@ class GitHubRunnerMatrix
|
||||
|
||||
SELF_HOSTED_LINUX_RUNNER = "linux-self-hosted-1"
|
||||
GITHUB_ACTIONS_LONG_TIMEOUT = 4320
|
||||
GITHUB_ACTIONS_SHORT_TIMEOUT = 120
|
||||
|
||||
sig { returns(LinuxRunnerSpec) }
|
||||
def linux_runner_spec
|
||||
@ -120,9 +121,11 @@ class GitHubRunnerMatrix
|
||||
end
|
||||
|
||||
github_run_id = ENV.fetch("GITHUB_RUN_ID")
|
||||
runner_timeout = ENV.fetch("HOMEBREW_MACOS_TIMEOUT").to_i
|
||||
long_timeout = ENV.fetch("HOMEBREW_MACOS_LONG_TIMEOUT", "false") == "true"
|
||||
use_github_runner = ENV.fetch("HOMEBREW_MACOS_BUILD_ON_GITHUB_RUNNER", "false") == "true"
|
||||
|
||||
runner_timeout = long_timeout ? GITHUB_ACTIONS_LONG_TIMEOUT : GITHUB_ACTIONS_SHORT_TIMEOUT
|
||||
|
||||
# Use GitHub Actions macOS Runner for testing dependents if compatible with timeout.
|
||||
use_github_runner ||= @dependent_matrix
|
||||
use_github_runner &&= runner_timeout <= GITHUB_ACTIONS_RUNNER_TIMEOUT
|
||||
|
@ -22,9 +22,9 @@ RSpec.describe Homebrew::DevCmd::DetermineTestRunners do
|
||||
let(:ephemeral_suffix) { "-12345" }
|
||||
let(:runner_env) do
|
||||
{
|
||||
"HOMEBREW_LINUX_RUNNER" => linux_runner,
|
||||
"HOMEBREW_MACOS_TIMEOUT" => "90",
|
||||
"GITHUB_RUN_ID" => ephemeral_suffix.split("-").second,
|
||||
"HOMEBREW_LINUX_RUNNER" => linux_runner,
|
||||
"HOMEBREW_MACOS_LONG_TIMEOUT" => "false",
|
||||
"GITHUB_RUN_ID" => ephemeral_suffix.split("-").second,
|
||||
}.freeze
|
||||
end
|
||||
let(:all_runners) do
|
||||
|
@ -6,7 +6,7 @@ require "test/support/fixtures/testball"
|
||||
RSpec.describe GitHubRunnerMatrix do
|
||||
before do
|
||||
allow(ENV).to receive(:fetch).with("HOMEBREW_LINUX_RUNNER").and_return("ubuntu-latest")
|
||||
allow(ENV).to receive(:fetch).with("HOMEBREW_MACOS_TIMEOUT").and_return("90")
|
||||
allow(ENV).to receive(:fetch).with("HOMEBREW_MACOS_LONG_TIMEOUT", "false").and_return("false")
|
||||
allow(ENV).to receive(:fetch).with("HOMEBREW_MACOS_BUILD_ON_GITHUB_RUNNER", "false").and_return("false")
|
||||
allow(ENV).to receive(:fetch).with("GITHUB_RUN_ID").and_return("12345")
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user