mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15322 from carlocab/rm-linux-cleanup

Browse Source 
github_runner_matrix: remove `HOMEBREW_LINUX_CLEANUP`
This commit is contained in:
Mike McQuaid 2023-04-27 12:28:45 +01:00 committed by GitHub
commit 9d5b017bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/github_runner_matrix.rb
View File

@ -62,10 +62,11 @@ class GitHubRunnerMatrix
private private
SELF_HOSTED_LINUX_RUNNER = "linux-self-hosted-1"
sig { returns(LinuxRunnerSpec) } sig { returns(LinuxRunnerSpec) }
def linux_runner_spec def linux_runner_spec
linux_runner = ENV.fetch("HOMEBREW_LINUX_RUNNER") linux_runner = ENV.fetch("HOMEBREW_LINUX_RUNNER")
linux_cleanup = ENV.fetch("HOMEBREW_LINUX_CLEANUP")
LinuxRunnerSpec.new( LinuxRunnerSpec.new(
name: "Linux", name: "Linux",
@ -76,7 +77,7 @@ class GitHubRunnerMatrix
}, },
workdir: "/github/home", workdir: "/github/home",
timeout: 4320, timeout: 4320,
cleanup: linux_cleanup == "true", cleanup: linux_runner == SELF_HOSTED_LINUX_RUNNER,
) )
end end

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

@ -15,7 +15,6 @@ describe "brew determine-test-runners" do
let(:runner_env) do let(:runner_env) do
{ {
"HOMEBREW_LINUX_RUNNER" => linux_runner, "HOMEBREW_LINUX_RUNNER" => linux_runner,
"HOMEBREW_LINUX_CLEANUP" => "false",
"HOMEBREW_MACOS_TIMEOUT" => "90", "HOMEBREW_MACOS_TIMEOUT" => "90",
"GITHUB_RUN_ID" => ephemeral_suffix.split("-").second, "GITHUB_RUN_ID" => ephemeral_suffix.split("-").second,
"GITHUB_RUN_ATTEMPT" => ephemeral_suffix.split("-").third, "GITHUB_RUN_ATTEMPT" => ephemeral_suffix.split("-").third,

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

@ -6,7 +6,6 @@ require "test/support/fixtures/testball"
describe GitHubRunnerMatrix do describe GitHubRunnerMatrix do
before do before do
allow(ENV).to receive(:fetch).with("HOMEBREW_LINUX_RUNNER").and_return("ubuntu-latest") allow(ENV).to receive(:fetch).with("HOMEBREW_LINUX_RUNNER").and_return("ubuntu-latest")
allow(ENV).to receive(:fetch).with("HOMEBREW_LINUX_CLEANUP").and_return("false")
allow(ENV).to receive(:fetch).with("HOMEBREW_MACOS_TIMEOUT").and_return("90") allow(ENV).to receive(:fetch).with("HOMEBREW_MACOS_TIMEOUT").and_return("90")
allow(ENV).to receive(:fetch).with("HOMEBREW_MACOS_BUILD_ON_GITHUB_RUNNER", "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") allow(ENV).to receive(:fetch).with("GITHUB_RUN_ID").and_return("12345")