From 9974b3df5d10d065972dde81cdd45f8347938efa Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Thu, 13 Jul 2023 13:44:50 -0400
Subject: [PATCH] feat: ruby 3.3.0-preview1 support

---
 .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++
 Dockerfile.mri.erb       | 10 +++++-----
 History.md               |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 483bc74..5f18bf7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,6 +120,8 @@ jobs:
         os:
           - ubuntu
         ruby:
+          - "head"
+          - "3.3.0-preview1"
           - "3.2"
           - "3.1"
           - "3.0"
@@ -156,6 +158,8 @@ jobs:
           - macos
           - ubuntu
         ruby:
+          - "head"
+          - "3.3.0-preview1"
           - "3.2"
           - "3.1"
           - "3.0"
@@ -179,11 +183,21 @@ jobs:
           - os: windows
             ruby: "3.2"
             platform: x64-mingw-ucrt
+          - os: windows
+            ruby: "3.3.0-preview1"
+            platform: x64-mingw-ucrt
+          - os: windows
+            ruby: "head"
+            platform: x64-mingw-ucrt
         exclude:
           - os: windows
             ruby: "3.1"
           - os: windows
             ruby: "3.2"
+          - os: windows
+            ruby: "3.3.0-preview1"
+          - os: windows
+            ruby: "head"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -213,6 +227,8 @@ jobs:
         os:
           - windows
         ruby:
+          - "head"
+          - "3.3.0-preview1"
           - "3.2"
           - "3.1"
           - "3.0"
@@ -229,11 +245,21 @@ jobs:
           - os: windows
             ruby: "3.2"
             platform: x64-mingw-ucrt
+          - os: windows
+            ruby: "3.3.0-preview1"
+            platform: x64-mingw-ucrt
+          - os: windows
+            ruby: "head"
+            platform: x64-mingw-ucrt
         exclude:
           - os: windows
             ruby: "3.1"
           - os: windows
             ruby: "3.2"
+          - os: windows
+            ruby: "3.3.0-preview1"
+          - os: windows
+            ruby: "head"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
diff --git a/Dockerfile.mri.erb b/Dockerfile.mri.erb
index aa4ac17..e7dfa6b 100644
--- a/Dockerfile.mri.erb
+++ b/Dockerfile.mri.erb
@@ -135,7 +135,7 @@ RUN bash -c " \
 axrubies = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.2.0:3.1.0", "3.1.3", true],
+    ["3.3.0-preview1:3.2.0:3.1.0", "3.1.3", true],
   ]
 elsif platform =~ /x64-mingw32/
   [
@@ -148,7 +148,7 @@ else
     # Build xruby versions prior ruby2_keywords in parallel using ruby-2.5
     ["2.6.0:2.5.0:2.4.0", "2.5.9", false],
     # Build xruby versions with ruby2_keywords in parallel using ruby-3.x
-    ["3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3", true],
+    ["3.3.0-preview1:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3", true],
   ]
 end
 
@@ -194,8 +194,8 @@ RUN find /usr/local/rake-compiler/ruby -name lib*-ruby*.dll.a | while read f ; d
 RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed -i 's/-lcrypt//' $f ; done
 
 <% if platform=~/darwin/ %>
-# ruby-3.2 on darwin links with `-bundle_loader`, see https://github.com/rake-compiler/rake-compiler-dock/issues/87
-RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby/3.2.0 -name rbconfig.rb | \
+# ruby-3.2+ on darwin links with `-bundle_loader`, see https://github.com/rake-compiler/rake-compiler-dock/issues/87
+RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby/3.[2-9].0 -name rbconfig.rb | \
     while read f ; do sed -i 's/\["EXTDLDFLAGS"\] = "/&-Wl,-flat_namespace /' $f ; done
 <% end %>
 
@@ -255,6 +255,6 @@ RUN bash -c " \
       rvm use default \
     "
 
-ENV RUBY_CC_VERSION 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.3.0: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 251fdbd..57d74ee 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,7 @@
 next / unreleased
 ------------------
 
+* Add Ruby 3.3.0-preview1 cross-compilation support.
 * Update to rake-compiler 1.2.2.