mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Add support for ubuntu-26.04 and ubuntu-26.04-arm
This commit is contained in:
@@ -49,7 +49,7 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act
|
|||||||
|
|
||||||
| Operating System | Supported |
|
| 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 |
|
| macOS | `macos-14` and newer versions |
|
||||||
| Windows | `windows-2022`, `windows-2025`, `windows-11-arm` |
|
| Windows | `windows-2022`, `windows-2025`, `windows-11-arm` |
|
||||||
|
|
||||||
|
|||||||
@@ -186,6 +186,8 @@ const GitHubHostedPlatforms = [
|
|||||||
'ubuntu-22.04-arm64',
|
'ubuntu-22.04-arm64',
|
||||||
'ubuntu-24.04-x64',
|
'ubuntu-24.04-x64',
|
||||||
'ubuntu-24.04-arm64',
|
'ubuntu-24.04-arm64',
|
||||||
|
'ubuntu-26.04-x64',
|
||||||
|
'ubuntu-26.04-arm64',
|
||||||
'windows-2022-x64',
|
'windows-2022-x64',
|
||||||
'windows-2025-x64',
|
'windows-2025-x64',
|
||||||
'windows-11-arm64'
|
'windows-11-arm64'
|
||||||
|
|||||||
+2
@@ -521,6 +521,8 @@ const GitHubHostedPlatforms = [
|
|||||||
'ubuntu-22.04-arm64',
|
'ubuntu-22.04-arm64',
|
||||||
'ubuntu-24.04-x64',
|
'ubuntu-24.04-x64',
|
||||||
'ubuntu-24.04-arm64',
|
'ubuntu-24.04-arm64',
|
||||||
|
'ubuntu-26.04-x64',
|
||||||
|
'ubuntu-26.04-arm64',
|
||||||
'windows-2022-x64',
|
'windows-2022-x64',
|
||||||
'windows-2025-x64',
|
'windows-2025-x64',
|
||||||
'windows-11-arm64'
|
'windows-11-arm64'
|
||||||
|
|||||||
@@ -23,8 +23,10 @@ runners = %w[
|
|||||||
macos-15-intel
|
macos-15-intel
|
||||||
ubuntu-22.04
|
ubuntu-22.04
|
||||||
ubuntu-24.04
|
ubuntu-24.04
|
||||||
|
ubuntu-26.04
|
||||||
ubuntu-22.04-arm
|
ubuntu-22.04-arm
|
||||||
ubuntu-24.04-arm
|
ubuntu-24.04-arm
|
||||||
|
ubuntu-26.04-arm
|
||||||
windows-2022
|
windows-2022
|
||||||
windows-2025
|
windows-2025
|
||||||
windows-11-arm
|
windows-11-arm
|
||||||
@@ -38,6 +40,9 @@ macos_arm64_runners, macos_x64_runners = macos_runners.partition { |runner| !run
|
|||||||
ubuntu_arm64_runners, ubuntu_x64_runners = ubuntu_runners.partition { |runner| runner.end_with?('-arm')}
|
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') }
|
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
|
# Versions
|
||||||
ruby_builder_versions = JSON.load(File.read('ruby-builder-versions.json'))
|
ruby_builder_versions = JSON.load(File.read('ruby-builder-versions.json'))
|
||||||
windows_versions = JSON.load(File.read('windows-versions.json'))
|
windows_versions = JSON.load(File.read('windows-versions.json'))
|
||||||
@@ -61,7 +66,7 @@ matrix += windows_x64_runners.product(ruby_loco_versions)
|
|||||||
|
|
||||||
# asan: latest release + head
|
# asan: latest release + head
|
||||||
asan_versions = %w[asan-release asan]
|
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
|
# https://github.com/ruby/setup-ruby/pull/596#discussion_r1606047680
|
||||||
matrix -= (ubuntu_runners - %w[ubuntu-22.04]).product(%w[1.9])
|
matrix -= (ubuntu_runners - %w[ubuntu-22.04]).product(%w[1.9])
|
||||||
@@ -71,6 +76,8 @@ matrix -= ubuntu_runners.product(%w[2.2])
|
|||||||
matrix -= macos_arm64_runners.product(%w[1.9 2.0 2.1 2.2 2.3 2.4 2.5])
|
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
|
# 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])
|
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+
|
# 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])
|
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])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user