Merge pull request #48 from flavorjones/flavorjones/ruby-4-rcd-1.11.0.rc2

precompiled: add native support for ruby 4

Author: flavorjones

.github/workflows/precompiled.yml

@@ -21,8 +21,9 @@ on:
 jobs:
   ruby_versions:
     outputs:
-      setup_ruby: "['3.1', '3.2', '3.3', '3.4']"
-      image_tag: "['3.1', '3.2', '3.3', '3.4']"
+      # these are usually the same, but are different once we get to ruby release candidates
+      setup_ruby: "['3.2', '3.3', '3.4', 'head']"
+      image_tag:  "['3.2', '3.3', '3.4', '4.0.0-preview2']"
     runs-on: ubuntu-latest
     steps:
       - run: echo "generating rubies ..."
@@ -36,7 +37,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           working-directory: precompiled
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
           bundler: latest
       - id: rcd_image_version
@@ -48,10 +49,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: ["ubuntu-latest", "macos-13", "windows-latest"]
+        runs-on: ["ubuntu-latest", "macos-latest", "windows-latest"]
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
     runs-on: ${{matrix.runs-on}}
     steps:
+      # git crlf needed to apply patches cleanly on windows runners
+      - name: configure git crlf
+        if: matrix.runs-on == 'windows-latest'
+        run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
@@ -76,7 +83,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           working-directory: precompiled
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
       - run: ./bin/test-gem-build gems ruby
         working-directory: precompiled
@@ -91,7 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest", "macos-13", "windows-latest"]
+        os: ["ubuntu-latest", "macos-15", "windows-latest"]
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -118,13 +125,13 @@ jobs:
           - "aarch64-linux-musl"
           - "arm-linux-gnu"
           - "arm-linux-musl"
+          - "arm64-darwin"
+          - "x64-mingw-ucrt"
           - "x86-linux-gnu"
           - "x86-linux-musl"
+          - "x86_64-darwin"
           - "x86_64-linux-gnu"
           - "x86_64-linux-musl"
-          - "arm64-darwin"
-          - "x86_64-darwin"
-          - "x64-mingw-ucrt"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -158,27 +165,27 @@ jobs:
           - "x86_64-linux-musl"
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
         include:
+          - { runon: "ubuntu-latest", platform: x86_64-linux-gnu }
           # declare docker image for each platform
-          - { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash &&" }
-          - { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash &&" }
-          - { platform: x86-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash &&" }
-          - { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash &&" }
+          - { runon: "ubuntu-latest", platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash &&" }
+          - { runon: "ubuntu-latest", platform: arm-linux-musl,     docker_tag: "-alpine", bootstrap: "apk add bash &&" }
+          - { runon: "ubuntu-latest", platform: x86-linux-musl,     docker_tag: "-alpine", bootstrap: "apk add bash &&" }
+          - { runon: "ubuntu-latest", platform: x86_64-linux-musl,  docker_tag: "-alpine", bootstrap: "apk add bash &&" }
           # declare docker platform for each platform
-          - { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64" }
-          - { platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64" }
-          - { platform: arm-linux-gnu, docker_platform: "--platform=linux/arm/v7" }
-          - { platform: arm-linux-musl, docker_platform: "--platform=linux/arm/v7" }
-          - { platform: x86-linux-gnu, docker_platform: "--platform=linux/386" }
-          - { platform: x86-linux-musl, docker_platform: "--platform=linux/386" }
-    runs-on: ubuntu-latest
+          - { runon: "ubuntu-24.04-arm", platform: aarch64-linux-gnu,  docker_platform: "--platform=linux/arm64" }
+          - { runon: "ubuntu-24.04-arm", platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64" }
+          - { runon: "ubuntu-24.04-arm", platform: arm-linux-gnu,      docker_platform: "--platform=linux/arm/v7" }
+          - { runon: "ubuntu-24.04-arm", platform: arm-linux-musl,     docker_platform: "--platform=linux/arm/v7" }
+          - { runon: "ubuntu-latest",    platform: x86-linux-gnu,      docker_platform: "--platform=linux/386" }
+          - { runon: "ubuntu-latest",    platform: x86-linux-musl,     docker_platform: "--platform=linux/386" }
+    runs-on: ${{ matrix.runon }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           name: cruby-${{ matrix.platform }}-gem
           path: precompiled/gems
       - run: |
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           docker run --rm -v $PWD/precompiled:/precompiled -w /precompiled \
             ${{ matrix.docker_platform }} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
             sh -c "
@@ -197,8 +204,8 @@ jobs:
           - x86_64-darwin
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
         include:
-          - { platform: arm64-darwin, os: macos-14 }
-          - { platform: x86_64-darwin, os: macos-13 }
+          - { platform: arm64-darwin, os: macos-15 }
+          - { platform: x86_64-darwin, os: macos-15-intel }
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## next / unreleased
+
+### `precompiled`
+
+- Update rake-compiler-dock to v1.11.0.rc1 (for Ruby 4 support)
+- Drop native support for Ruby 3.1
+- Add native support for Ruby 4.0 (preview3)
+
+
 ## v0.7.0 / 2025-09-14
 
 ### General changes

precompiled/Gemfile

@@ -8,6 +8,6 @@ gemspec
 gem "rake", "~> 13.0"
 
 gem "rake-compiler"
-gem "rake-compiler-dock", "1.9.1"
+gem "rake-compiler-dock", "1.11.0.rc1"
 
 gem "minitest", "~> 5.0"

precompiled/Rakefile

@@ -19,7 +19,7 @@ cross_platforms = [
   "x86_64-darwin",
   "x64-mingw-ucrt",
 ]
-RakeCompilerDock.set_ruby_cc_version("~> 3.1")
+RakeCompilerDock.set_ruby_cc_version(">= 3.2")
 
 rcee_precompiled_spec = Bundler.load_gemspec("rcee_precompiled.gemspec")
 Gem::PackageTask.new(rcee_precompiled_spec).define #packaged_tarball version of the gem for platform=ruby

precompiled/ext/precompiled/extconf.rb

@@ -39,7 +39,10 @@ def configure_packaged_libraries
 
           # use the packaged libyaml
           recipe.activate
-          pkg_config(File.join(recipe.path, "lib", "pkgconfig", "yaml-0.1.pc"))
+
+          # explicitly add include/lib paths (pkg_config may not extract them correctly on all platforms)
+          $INCFLAGS << " -I#{File.join(recipe.path, "include")}"
+          $LIBPATH << File.join(recipe.path, "lib")
 
           # assert that we can build against the packaged libyaml
           unless have_library("yaml", "yaml_get_version", "yaml.h")
@@ -62,6 +65,7 @@ def libyaml_recipe
               sha256: "c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4"
             }]
             recipe.target = File.join(PACKAGE_ROOT_DIR, "ports")
+            recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches", "libyaml", "*.patch")].sort
           end
         end
       end