Compare commits

...
3 Commits
Author SHA1 Message Date
Benoit Daloze 9eb537ca03 Add support for ubuntu-26.04 and ubuntu-26.04-arm 2026-06-20 15:21:29 +02:00
Benoit Daloze e1a3b100ca Improve versions-strings-for-builder.rb 2026-06-20 15:21:29 +02:00
Benoit Daloze 0df5288f06 Remove gem install sassc on Windows JRuby
* It's quite slow and sassc is EOL.
2026-06-20 13:14:10 +02:00
6 changed files with 16 additions and 6 deletions
-3
View File
@@ -135,9 +135,6 @@ jobs:
- name: bash test - name: bash test
shell: bash shell: bash
run: echo ~ && bundle install run: echo ~ && bundle install
- name: Windows JRuby
if: runner.os == 'Windows' && startsWith(matrix.ruby, 'jruby')
run: gem install sassc
testDotRubyVersion: testDotRubyVersion:
name: "Test .ruby-version" name: "Test .ruby-version"
+1 -1
View File
@@ -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` |
+2
View File
@@ -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'
Generated Vendored
+2
View File
@@ -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'
+8 -1
View File
@@ -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])
+3 -1
View File
@@ -5,7 +5,7 @@ versions = JSON.load(hash).transform_keys(&:to_sym)
ONLY_LATEST_PATCH = ENV['ONLY_LATEST_PATCH'] ONLY_LATEST_PATCH = ENV['ONLY_LATEST_PATCH']
def filter(versions) def filter(versions)
versions -= %w[head] versions -= %w[head debug asan asan-release 3.5.0-preview1]
if ONLY_LATEST_PATCH if ONLY_LATEST_PATCH
versions = versions.group_by { |v| v[/^\d+\.\d+/] }.map { _2.last } versions = versions.group_by { |v| v[/^\d+\.\d+/] }.map { _2.last }
end end
@@ -29,5 +29,7 @@ puts filter(versions[:"truffleruby+graalvm"]).map { |v| "truffleruby+graalvm-#{v
puts puts
puts filter(versions[:jruby]).map { |v| "jruby-#{v}" }.join(', ') puts filter(versions[:jruby]).map { |v| "jruby-#{v}" }.join(', ')
puts
puts "For Windows:" puts "For Windows:"
puts filter(versions[:jruby]).join(', ') puts filter(versions[:jruby]).join(', ')