Merge pull request #175 from rake-compiler/flavorjones/ruby-4-support

Add support for Ruby 4.0.0-preview2

Author: flavorjones

.github/workflows/ci.yml

@@ -167,7 +167,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -192,7 +192,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [x86_64-linux, x86_64-linux-gnu]
-        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "3.0", rubygems: "3.5.23" }
@@ -235,7 +235,7 @@ jobs:
           - x86_64-linux
           - x86_64-linux-gnu
           - x86_64-linux-musl
-        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "3.0", rubygems: "3.5.23" }
@@ -283,7 +283,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15-intel, macos-15]
-        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
         include:
           - os: macos-15-intel
             platform: x86_64-darwin
@@ -310,6 +310,9 @@ jobs:
           - os: windows-latest
             ruby: "3.4"
             platform: x64-mingw-ucrt
+          - os: windows-latest
+            ruby: "head" # setup-ruby does not have 4.0 previews yet on windows
+            platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -356,6 +359,9 @@ jobs:
           - os: windows-latest
             ruby: "3.4"
             platform: x64-mingw-ucrt
+          - os: windows-latest
+            ruby: "head" # setup-ruby does not have 4.0 previews yet on windows
+            platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## next / unreleased
 
+- Add Ruby 4.0.0-preview2 cross-compilation support.
 - Bump Ruby 3.3 to v3.3.10 (from v3.3.9) @flavorjones
 - Bump Ruby 3.4 to v3.4.8 (from v3.4.5) @flavorjones
 - Bump rake-compiler dependency to v1.3.1 (from v1.2.9) @flavorjones

Dockerfile.mri.erb

@@ -39,7 +39,7 @@ ENV BASH_ENV=/etc/rubybashrc
 ##
 USER rubyuser
 
-ENV RBENV_RUBIES="3.1.7 3.4.8"
+ENV RBENV_RUBIES="3.1.7 3.4.8 4.0.0-preview2"
 
 # Install the bootstrap rubies
 RUN bash -c " \
@@ -152,6 +152,7 @@ xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1+ is platform x64-mingw-ucrt
     ["3.4.8:3.3.10:3.2.9:3.1.7", "3.4.8"],
+    ["4.0.0-preview2", "4.0.0-preview2"],
   ]
 elsif platform =~ /aarch64-mingw-ucrt/
   [
@@ -166,6 +167,7 @@ else
   [
     ["2.7.8", "3.1.7"],
     ["3.4.8:3.3.10:3.2.9:3.1.7:3.0.7", "3.4.8"],
+    ["4.0.0-preview2", "4.0.0-preview2"],
   ]
 end
 
@@ -269,6 +271,6 @@ COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
 RUN bash -c "rbenv global 3.4.8"
 
-ENV RUBY_CC_VERSION=3.4.8:3.3.10:3.2.9:3.1.7:3.0.7:2.7.8
+ENV RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7:2.7.8
 
 CMD bash

build/patches/rake-compiler-1.3.1/0006-ruby-4-rubyspec-capiext.patch

@@ -0,0 +1,16 @@
+diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
+index 3d23eed6..904c12e0 100644
+--- a/tasks/bin/cross-ruby.rake
++++ b/tasks/bin/cross-ruby.rake
+@@ -150,6 +150,11 @@
+ 
+     # make
+     file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
++      if ruby_cc_version.start_with?("ruby-4.0")
++        # https://bugs.ruby-lang.org/issues/21792 - hopefully will be fixed by 4.0.0 final
++        FileUtils.rm_f("#{USER_HOME}/sources/#{ruby_cc_version}/spec/ruby/optional/capi/ext/digest_spec.c")
++      end
++
+       if ruby_cc_version.start_with?("ruby-3.1") && mingw_target =~ /darwin/
+         # for later 3.1.x releases, we need to explicitly build miniruby
+         # see https://bugs.ruby-lang.org/issues/19239

lib/rake_compiler_dock.rb

@@ -92,6 +92,7 @@ def exec(*args, &block)
   #
   def cross_rubies
     {
+      "4.0" => "4.0.0",
       "3.4" => "3.4.8",
       "3.3" => "3.3.10",
       "3.2" => "3.2.9",

test/test_versions.rb

@@ -55,7 +55,7 @@ def test_ruby_cc_versions_requirements
     assert_equal(expected, RakeCompilerDock.ruby_cc_version("~> 3.2.0", "~> 3.4.0"))
     assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2.0"), Gem::Requirement.new("~> 3.4.0")))
 
-    expected = [cross["3.4"], cross["3.3"], cross["3.2"]].join(":")
+    expected = [cross["4.0"], cross["3.4"], cross["3.3"], cross["3.2"]].join(":")
     assert_equal(expected, RakeCompilerDock.ruby_cc_version(">= 3.2"))
     assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new(">= 3.2")))