Skip to content

Commit 3a003aa

Browse files
committed
Add support for ubuntu-26.04 and ubuntu-26.04-arm
1 parent 6e75ed1 commit 3a003aa

4 files changed

Lines changed: 19 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act
4949

5050
| Operating System | Supported |
5151
| ---------------- | --------- |
52-
| Ubuntu | `ubuntu-22.04`, `ubuntu-24.04`, `ubuntu-22.04-arm`, `ubuntu-24.04-arm` |
52+
| Ubuntu | `ubuntu-22.04`, `ubuntu-24.04`, `ubuntu-26.04`, `ubuntu-22.04-arm`, `ubuntu-24.04-arm`, `ubuntu-26.04-arm` |
5353
| macOS | `macos-14` and newer versions |
5454
| Windows | `windows-2022`, `windows-2025`, `windows-11-arm` |
5555

common.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ const GitHubHostedPlatforms = [
186186
'ubuntu-22.04-arm64',
187187
'ubuntu-24.04-x64',
188188
'ubuntu-24.04-arm64',
189+
'ubuntu-26.04-x64',
190+
'ubuntu-26.04-arm64',
189191
'windows-2022-x64',
190192
'windows-2025-x64',
191193
'windows-11-arm64'

dist/index.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generate-test-matrix.rb

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,21 @@ def unique_versions(versions, segment_count, *symbolic)
2323
macos-15-intel
2424
ubuntu-22.04
2525
ubuntu-24.04
26+
ubuntu-26.04
2627
ubuntu-22.04-arm
2728
ubuntu-24.04-arm
29+
ubuntu-26.04-arm
2830
windows-2022
2931
windows-2025
3032
windows-11-arm
3133
].freeze
3234

35+
# TMP
36+
runners = %w[
37+
ubuntu-26.04
38+
ubuntu-26.04-arm
39+
]
40+
3341
macos_runners = runners.select { |runner| runner.start_with?('macos-') }
3442
ubuntu_runners = runners.select { |runner| runner.start_with?('ubuntu-') }
3543
windows_runners, non_windows_runners = runners.partition { |runner| runner.start_with?('windows-') }
@@ -38,6 +46,9 @@ def unique_versions(versions, segment_count, *symbolic)
3846
ubuntu_arm64_runners, ubuntu_x64_runners = ubuntu_runners.partition { |runner| runner.end_with?('-arm')}
3947
windows_arm64_runners, windows_x64_runners = windows_runners.partition { |runner| runner.end_with?('-arm') }
4048

49+
asan_runners = ubuntu_x64_runners.grep(/ubuntu-24\.04/)
50+
ubuntu2604_runners = ubuntu_runners.grep(/ubuntu-26\.04/)
51+
4152
# Versions
4253
ruby_builder_versions = JSON.load(File.read('ruby-builder-versions.json'))
4354
windows_versions = JSON.load(File.read('windows-versions.json'))
@@ -61,7 +72,7 @@ def unique_versions(versions, segment_count, *symbolic)
6172

6273
# asan: latest release + head
6374
asan_versions = %w[asan-release asan]
64-
matrix += ubuntu_x64_runners.sort.last(1).product(asan_versions)
75+
matrix += asan_runners.sort.last(1).product(asan_versions)
6576

6677
# https://github.com/ruby/setup-ruby/pull/596#discussion_r1606047680
6778
matrix -= (ubuntu_runners - %w[ubuntu-22.04]).product(%w[1.9])
@@ -71,6 +82,8 @@ def unique_versions(versions, segment_count, *symbolic)
7182
matrix -= macos_arm64_runners.product(%w[1.9 2.0 2.1 2.2 2.3 2.4 2.5])
7283
# These old Rubies fail to compile or segfault on Linux arm64
7384
matrix -= ubuntu_arm64_runners.product(%w[1.9 2.0 2.1 2.2])
85+
# These old Rubies fail to compile on ubuntu-26.04
86+
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])
7487
# RubyInstaller windows-arm64 builds only exist for Ruby 3.4+
7588
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])
7689

0 commit comments

Comments
 (0)