From f00a02d9f9fb904c351e7073677bea5fd226a954 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Fri, 13 Dec 2024 15:26:50 -0500
Subject: [PATCH] Add Ruby 3.4 cross-compilation support.

---
 .github/workflows/ci.yml | 14 ++++++++++----
 Dockerfile.mri.erb       |  6 +++---
 History.md               |  7 +++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc39793..50f9433 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -144,7 +144,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -169,7 +169,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [x86_64-linux, x86_64-linux-gnu]
-        ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "2.7", rubygems: "3.4.22" }
@@ -213,7 +213,7 @@ jobs:
           - x86_64-linux
           - x86_64-linux-gnu
           - x86_64-linux-musl
-        ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "2.7", rubygems: "3.4.22" }
@@ -262,7 +262,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, macos-14]
-        ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
         exclude:
           # setup-ruby does not provide ruby 2.4 or 2.5 on arm64-darwin as of 2024-05-01
           - os: macos-14
@@ -301,6 +301,9 @@ jobs:
           - os: windows-latest
             ruby: "3.3"
             platform: x64-mingw-ucrt
+          - os: windows-latest
+            ruby: "head" # "3.4.0-rc1" not available yet on windows
+            platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -353,6 +356,9 @@ jobs:
           - os: windows-latest
             ruby: "3.3"
             platform: x64-mingw-ucrt
+          - os: windows-latest
+            ruby: "head" # "3.4.0-rc1" not available yet on windows
+            platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
diff --git a/Dockerfile.mri.erb b/Dockerfile.mri.erb
index 77fe387..049dde8 100644
--- a/Dockerfile.mri.erb
+++ b/Dockerfile.mri.erb
@@ -110,7 +110,7 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.3.5:3.2.0:3.1.0", "3.1.3"],
+    ["3.4.0-rc1:3.3.5:3.2.0:3.1.0", "3.1.3"],
   ]
 elsif platform =~ /x64-mingw32/
   [
@@ -121,7 +121,7 @@ elsif platform =~ /x64-mingw32/
 else
   [
     ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
+    ["3.4.0-rc1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
   ]
 end
 
@@ -217,6 +217,6 @@ COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
 RUN bash -c "rbenv global 3.1.3"
 
-ENV RUBY_CC_VERSION=3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
+ENV RUBY_CC_VERSION=3.4.0:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
 
 CMD bash
diff --git a/History.md b/History.md
index 0887fcb..dba9736 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,12 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
+## next / unreleased
+
+### Ruby 3.4 support
+
+- Add Ruby 3.4.0-rc1 cross-compilation support.
+
+
 ## v1.6.0 / 2024-12-13
 
 ### Notable changes