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

github_runner_matrix: simplify

Browse Source
This commit is contained in:
Carlo Cabrera 2023-04-25 14:54:44 +08:00
parent 3baacbbc72
commit 97655276b2
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Homebrew/github_runner_matrix.rb
View File

@ -136,8 +136,7 @@ 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.
use_ephemeral = (macos_version >= :ventura && @dependent_matrix) || use_ephemeral = macos_version >= (@dependent_matrix ? :ventura : :monterey)
(macos_version >= :monterey && !@dependent_matrix)
runner, cleanup = if use_ephemeral runner, cleanup = if use_ephemeral
["#{version}-arm64#{ephemeral_suffix}", false] ["#{version}-arm64#{ephemeral_suffix}", false]
else else
@ -164,9 +163,12 @@ class GitHubRunnerMatrix
arch = runner.arch arch = runner.arch
macos_version = runner.macos_version macos_version = runner.macos_version
compatible_formulae.select! { |formula| formula.public_send(:"#{platform}_compatible?") } compatible_formulae.select! do |formula|
compatible_formulae.select! { |formula| formula.public_send(:"#{arch}_compatible?") } next false if macos_version && !formula.compatible_with?(macos_version)
compatible_formulae.select! { |formula| formula.compatible_with?(macos_version) } if macos_version
formula.public_send(:"#{platform}_compatible?") &&
formula.public_send(:"#{arch}_compatible?")
end
compatible_formulae.present? compatible_formulae.present?
end end
@ -188,9 +190,12 @@ class GitHubRunnerMatrix
compatible_dependents = formula.dependents(platform: platform, arch: arch, macos_version: macos_version&.to_sym) compatible_dependents = formula.dependents(platform: platform, arch: arch, macos_version: macos_version&.to_sym)
.dup .dup
compatible_dependents.select! { |dependent_f| dependent_f.public_send(:"#{platform}_compatible?") } compatible_dependents.select! do |dependent_f|
compatible_dependents.select! { |dependent_f| dependent_f.public_send(:"#{arch}_compatible?") } next false if macos_version && !dependent_f.compatible_with?(macos_version)
compatible_dependents.select! { |dependent_f| dependent_f.compatible_with?(macos_version) } if macos_version
dependent_f.public_send(:"#{platform}_compatible?") &&
dependent_f.public_send(:"#{arch}_compatible?")
end
# These arrays will generally have been generated by different Formulary caches, # These arrays will generally have been generated by different Formulary caches,
# so we can only compare them by name and not directly. # so we can only compare them by name and not directly.