From ff89addd99cf0c175a9059aeca562f10eb207a9e Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 20 Jun 2026 13:13:21 +0200 Subject: [PATCH 1/2] Improve versions-strings-for-builder.rb --- versions-strings-for-builder.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versions-strings-for-builder.rb b/versions-strings-for-builder.rb index 4217803a7..55b5c2c33 100644 --- a/versions-strings-for-builder.rb +++ b/versions-strings-for-builder.rb @@ -5,7 +5,7 @@ ONLY_LATEST_PATCH = ENV['ONLY_LATEST_PATCH'] def filter(versions) - versions -= %w[head] + versions -= %w[head debug asan asan-release 3.5.0-preview1] if ONLY_LATEST_PATCH versions = versions.group_by { |v| v[/^\d+\.\d+/] }.map { _2.last } end @@ -29,5 +29,7 @@ def filter(versions) puts puts filter(versions[:jruby]).map { |v| "jruby-#{v}" }.join(', ') + +puts puts "For Windows:" puts filter(versions[:jruby]).join(', ') From face60bd6ae0b4793bd14767a94d333a2e68321b Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 20 Jun 2026 13:18:00 +0200 Subject: [PATCH 2/2] Add support for ubuntu-26.04 and ubuntu-26.04-arm --- README.md | 2 +- common.js | 2 ++ dist/index.js | 2 ++ generate-test-matrix.rb | 9 ++++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e2ac7ba8e..fa74077bb 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act | Operating System | Supported | | ---------------- | --------- | -| Ubuntu | `ubuntu-22.04`, `ubuntu-24.04`, `ubuntu-22.04-arm`, `ubuntu-24.04-arm` | +| Ubuntu | `ubuntu-22.04`, `ubuntu-24.04`, `ubuntu-26.04`, `ubuntu-22.04-arm`, `ubuntu-24.04-arm`, `ubuntu-26.04-arm` | | macOS | `macos-14` and newer versions | | Windows | `windows-2022`, `windows-2025`, `windows-11-arm` | diff --git a/common.js b/common.js index c62d22686..79ad6266f 100644 --- a/common.js +++ b/common.js @@ -186,6 +186,8 @@ const GitHubHostedPlatforms = [ 'ubuntu-22.04-arm64', 'ubuntu-24.04-x64', 'ubuntu-24.04-arm64', + 'ubuntu-26.04-x64', + 'ubuntu-26.04-arm64', 'windows-2022-x64', 'windows-2025-x64', 'windows-11-arm64' diff --git a/dist/index.js b/dist/index.js index 717fb250d..524f55d18 100644 --- a/dist/index.js +++ b/dist/index.js @@ -521,6 +521,8 @@ const GitHubHostedPlatforms = [ 'ubuntu-22.04-arm64', 'ubuntu-24.04-x64', 'ubuntu-24.04-arm64', + 'ubuntu-26.04-x64', + 'ubuntu-26.04-arm64', 'windows-2022-x64', 'windows-2025-x64', 'windows-11-arm64' diff --git a/generate-test-matrix.rb b/generate-test-matrix.rb index 703fec805..59b8d95cc 100644 --- a/generate-test-matrix.rb +++ b/generate-test-matrix.rb @@ -23,8 +23,10 @@ def unique_versions(versions, segment_count, *symbolic) macos-15-intel ubuntu-22.04 ubuntu-24.04 + ubuntu-26.04 ubuntu-22.04-arm ubuntu-24.04-arm + ubuntu-26.04-arm windows-2022 windows-2025 windows-11-arm @@ -38,6 +40,9 @@ def unique_versions(versions, segment_count, *symbolic) 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') } +asan_runners = ubuntu_x64_runners.grep(/ubuntu-24\.04/) +ubuntu2604_runners = ubuntu_runners.grep(/ubuntu-26\.04/) + # Versions ruby_builder_versions = JSON.load(File.read('ruby-builder-versions.json')) windows_versions = JSON.load(File.read('windows-versions.json')) @@ -61,7 +66,7 @@ def unique_versions(versions, segment_count, *symbolic) # asan: latest release + head asan_versions = %w[asan-release asan] -matrix += ubuntu_x64_runners.sort.last(1).product(asan_versions) +matrix += asan_runners.sort.last(1).product(asan_versions) # https://github.com/ruby/setup-ruby/pull/596#discussion_r1606047680 matrix -= (ubuntu_runners - %w[ubuntu-22.04]).product(%w[1.9]) @@ -71,6 +76,8 @@ def unique_versions(versions, segment_count, *symbolic) matrix -= macos_arm64_runners.product(%w[1.9 2.0 2.1 2.2 2.3 2.4 2.5]) # These old Rubies fail to compile or segfault on Linux arm64 matrix -= ubuntu_arm64_runners.product(%w[1.9 2.0 2.1 2.2]) +# These old Rubies fail to compile on ubuntu-26.04 +matrix -= ubuntu2604_runners.product(%w[1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1]) # 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])