From 18f9bdecd9bd516fd4c63e29ae2029c8bc175e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Fri, 27 Mar 2026 16:00:42 -0700 Subject: [PATCH] Refactor matrix script --- generate-test-matrix.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/generate-test-matrix.rb b/generate-test-matrix.rb index 4a0c131f1..dac2ddac3 100644 --- a/generate-test-matrix.rb +++ b/generate-test-matrix.rb @@ -33,9 +33,8 @@ def unique_versions(versions, segment_count, *symbolic) macos_runners = runners.select { |runner| runner.start_with?('macos-') } ubuntu_runners = runners.select { |runner| runner.start_with?('ubuntu-') } windows_runners, non_windows_runners = runners.partition { |runner| runner.start_with?('windows-') } -macos_intel_runners = runners.grep(/macos.+intel/) -macos_arm64_runners, _macos_x64_runners = macos_runners.partition { |runner| !runner.end_with?('-intel')} +macos_arm64_runners, macos_x64_runners = macos_runners.partition { |runner| !runner.end_with?('-intel')} ubuntu_arm64_runners, ubuntu_x64_runners = ubuntu_runners.partition { |runner| runner.end_with?('-arm')} windows_arm64_runners, windows_x64_runners = windows_runners.partition { |runner| runner.end_with?('-arm') } @@ -75,6 +74,6 @@ def unique_versions(versions, segment_count, *symbolic) # RubyInstaller windows-arm64 builds only exist for Ruby 3.4+ matrix -= windows_arm64_runners.product(%w[2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3]) # TruffleRuby 34+ does not support macOS Intel -matrix -= macos_intel_runners.product(%w[truffleruby-head truffleruby+graalvm-head]) +matrix -= macos_x64_runners.product(%w[truffleruby-head truffleruby+graalvm-head]) puts(JSON.generate(matrix.sort.map { |os, ruby| { os:, ruby: } }))