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 #15205 from carlocab/fix-dep-runners

Browse Source 
github_runner_matrix: fix dependent runner assignment
This commit is contained in:
Carlo Cabrera 2023-04-12 02:50:31 +08:00 committed by GitHub
commit 80372686fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/github_runner_matrix.rb
View File

@ -110,7 +110,9 @@ 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")
ephemeral_suffix = "-#{github_run_id}-#{github_run_attempt}" ephemeral_suffix = +"-#{github_run_id}-#{github_run_attempt}"
ephemeral_suffix << "-deps" if @dependent_matrix
ephemeral_suffix.freeze
MacOSVersions::SYMBOLS.each_value do |version| MacOSVersions::SYMBOLS.each_value do |version|
macos_version = OS::Mac::Version.new(version) macos_version = OS::Mac::Version.new(version)
@ -126,7 +128,9 @@ class GitHubRunnerMatrix
next unless macos_version >= :big_sur next unless macos_version >= :big_sur
# Use bare metal runner when testing dependents on ARM64 Monterey. # Use bare metal runner when testing dependents on ARM64 Monterey.
runner, cleanup = if (macos_version >= :ventura && @dependent_matrix) || macos_version >= :monterey use_ephemeral = (macos_version >= :ventura && @dependent_matrix) ||
(macos_version >= :monterey && !@dependent_matrix)
runner, cleanup = if use_ephemeral
["#{version}-arm64#{ephemeral_suffix}", false] ["#{version}-arm64#{ephemeral_suffix}", false]
else else
["#{version}-arm64", true] ["#{version}-arm64", true]