rake-compiler-dock 1.11.0.rc1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b9a2f0d923f15cbc4fe407bf349950e9d17cc3d34ced2d1998f5f326e73355
-  data.tar.gz: 46b66db870a95c7f540c0bb05967a00da1e37c55c69ea78ffa21f4ad7b988949
+  metadata.gz: d5d20cc673c40ffa60102f730c837c2bd594a4c3f492898c43ba826aa86e4e77
+  data.tar.gz: 38cb0cf4233c363a2d86f7f86f96c964b86abc1a157eb29ff265e1337e12d8d3
 SHA512:
-  metadata.gz: a44d3babc2a45bc8543321998c5304fb9edf2b32626764b878b29f307ad366d44f41a4ad1ce6076e6b9bd279b67a79c70079d6b663eeda6d9cfaae484e5d04ac
-  data.tar.gz: 106e89b7340ec2ca007f8219af91ed24433efabf2f5ad821fc1e442cc6d068e15313497b08dacc10b288014fffef4ff8b557ee939df59ed8b17563cad87a371c
+  metadata.gz: 9b0d0f60cbe7c1e0a097ce57acad64240c34497d7fe257018fbcf286295e36a387dc7212c03cb15c766b7f8e6bad95e071785c885d18ffe6b631c014062cd4b7
+  data.tar.gz: 1ff93f160999d7ff66e918480810312503bb9e41f13f9c71d7d6f65804880d71f0c044b8a8522e97023078224bd73dd7fcfb869eaaaeacda23fdf71699ea3f59

data/.github/workflows/ci.yml

@@ -167,7 +167,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -192,11 +192,10 @@ jobs:
       fail-fast: false
       matrix:
         platform: [x86_64-linux, x86_64-linux-gnu]
-        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "3.0", rubygems: "3.5.23" }
-          - { ruby: "2.7", rubygems: "3.4.22" }
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -235,11 +234,10 @@ jobs:
           - x86_64-linux
           - x86_64-linux-gnu
           - x86_64-linux-musl
-        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "3.0", rubygems: "3.5.23" }
-          - { ruby: "2.7", rubygems: "3.4.22" }
           # declare docker image for each platform
           - { platform: aarch64-linux-musl, runon: "ubuntu-24.04-arm", docker_tag: "-alpine" }
           - { platform: arm-linux-musl, runon: "ubuntu-24.04-arm", docker_tag: "-alpine" }
@@ -283,7 +281,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15-intel, macos-15]
-        ruby: ["4.0.0-preview2", "3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+        ruby: ["4.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
         include:
           - os: macos-15-intel
             platform: x86_64-darwin
@@ -292,9 +290,6 @@ jobs:
           - os: ubuntu-latest
             ruby: jruby
             platform: jruby
-          - os: windows-latest
-            ruby: "2.7"
-            platform: x64-mingw32
           - os: windows-latest
             ruby: "3.0"
             platform: x64-mingw32
@@ -311,7 +306,7 @@ jobs:
             ruby: "3.4"
             platform: x64-mingw-ucrt
           - os: windows-latest
-            ruby: "head" # setup-ruby does not have 4.0 previews yet on windows
+            ruby: "4.0"
             platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
@@ -341,9 +336,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-latest
-            ruby: "2.7"
-            platform: x64-mingw32
           - os: windows-latest
             ruby: "3.0"
             platform: x64-mingw32
@@ -360,7 +352,7 @@ jobs:
             ruby: "3.4"
             platform: x64-mingw-ucrt
           - os: windows-latest
-            ruby: "head" # setup-ruby does not have 4.0 previews yet on windows
+            ruby: "4.0"
             platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
@@ -391,9 +383,14 @@ jobs:
       matrix:
         include:
           - runon: ubuntu-24.04-arm
-            from_image: navikey/raspbian-bullseye
+            from_image: ghcr.io/dtcooper/raspberrypi-os:latest
+            image_platform: linux/arm64
+            platform: aarch64-linux
+            dockerfile: debian
+          - runon: ubuntu-24.04-arm
+            from_image: ghcr.io/dtcooper/raspberrypi-os:latest
             image_platform: linux/arm/v7
-            platform: arm-linux # bullseye ships ruby 2.7, rubygems won't recognize -gnu suffix
+            platform: arm-linux
             dockerfile: debian
           - runon: ubuntu-24.04-arm
             from_image: arm64v8/ubuntu

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
-## 1.11.0.rc1 / 2025-12-18
+## next / unreleased
+
+...
+
+
+## 1.11.1 / 2025-12-26
+
+- Replace JRuby 9.4 with JRuby 10.0 in the JRuby build container. #185 @flavorjones
+
+
+## 1.11.0 / 2025-12-25
+
+- Bump Ruby 4 cross-compilation support to 4.0.0.
+- Drop support for Ruby 2.7. #180 @larskanis
+- Remove native Ruby 3.4.8 from the host environment. #178 @larskanis
+
+### CRuby container summary
+
+- native rubies: 4.0.0 (default), 3.1.7
+- `RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7`
+
+
+## 1.11.0.rc1 / 2025-12-19
 
 ### Changes
 

data/Dockerfile.jruby

@@ -1,9 +1,9 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update && \
     apt-get install -y sudo wget curl git-core build-essential xz-utils unzip dirmngr && \
-    apt-get install -y openjdk-11-jdk-headless maven && \
+    apt-get install -y openjdk-21-jdk-headless maven && \
     rm -rf /var/lib/apt/lists/*
 
 ##
@@ -11,7 +11,7 @@ RUN apt-get -y update && \
 ##
 RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
 
-ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="jruby-9.4.0.0"
+ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="jruby-10.0.0.0"
 
 # chown after running `rbenv init` because that command creates some subdirectories
 RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
@@ -74,6 +74,6 @@ COPY build/runas /usr/local/bin/
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-RUN bash -c "rbenv global jruby-9.4.0.0"
+RUN bash -c "rbenv global jruby-10.0.0.0"
 
 CMD bash

data/Dockerfile.mri.erb

@@ -39,7 +39,7 @@ ENV BASH_ENV=/etc/rubybashrc
 ##
 USER rubyuser
 
-ENV RBENV_RUBIES="3.1.7 3.4.8 4.0.0-preview2"
+ENV RBENV_RUBIES="3.1.7 4.0.0"
 
 # Install the bootstrap rubies
 RUN bash -c " \
@@ -151,23 +151,28 @@ USER rubyuser
 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"],
+    ["3.3.10:3.2.9:3.1.7", "3.1.7"],
+    ["4.0.0:3.4.8", "4.0.0"],
   ]
 elsif platform =~ /aarch64-mingw-ucrt/
   [
-    ["3.4.8", "3.1.7"],
+    ["4.0.0:3.4.8", "4.0.0"],
   ]
 elsif platform =~ /x64-mingw32/
   [
     # Rubyinstaller prior to 3.1 is platform x64-mingw32
-    ["3.0.7:2.7.8", "3.1.7"],
+    ["3.0.7", "3.1.7"],
+  ]
+elsif platform =~ /x86-mingw32/
+  [
+    # There's no Rubyinstaller-4.x for platform x86-mingw32
+    ["3.3.10:3.2.9:3.1.7:3.0.7", "3.1.7"],
+    ["3.4.8", "4.0.0"],
   ]
 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"],
+    ["3.3.10:3.2.9:3.1.7:3.0.7", "3.1.7"],
+    ["4.0.0:3.4.8", "4.0.0"],
   ]
 end
 
@@ -194,7 +199,7 @@ RUN bash -c " \
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.so | xargs rm
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby-static.a | while read f ; do cp $f `echo $f | sed s/-static//` ; done
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.a | while read f ; do ar t $f | xargs ar d $f ; done
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static -lpthread -lrt -ldl/' $f ; done
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static -lpthread -lrt -ldl -latomic/' $f ; done
 <% end %>
 
 <% if platform =~ /mingw/ %>
@@ -269,8 +274,8 @@ RUN echo 'source /etc/profile.d/rcd-env.sh' >> /etc/rubybashrc
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-RUN bash -c "rbenv global 3.4.8"
+RUN bash -c "rbenv global 4.0.0"
 
-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
+ENV RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7
 
 CMD bash

data/build/gem_helper.rb

@@ -24,10 +24,6 @@ module RakeCompilerDock
       Time.now.strftime("%Y-%m-%d")
     end
 
-    def version_tag
-      "#{version}"
-    end
-
     def update_history
       hin = File.read(hfile)
       hout = hin.sub(/#{headline}/) do

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.11.0.rc1"
-  IMAGE_VERSION = "1.11.0.rc1"
+  VERSION = "1.11.1"
+  IMAGE_VERSION = "1.11.1"
 end

data/lib/rake_compiler_dock.rb

@@ -98,7 +98,6 @@ module RakeCompilerDock
       "3.2" => "3.2.9",
       "3.1" => "3.1.7",
       "3.0" => "3.0.7",
-      "2.7" => "2.7.8",
     }
   end
 

data/test/rcd_test/Gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in rcd_test.gemspec
-gemspec
+# No rcd_test gem, since "bundle package" fails on bundler-2.7+, if the extension isn't built
+# gemspec
 
 gem "rake", "~> 13.0"
 gem "rake-compiler"

data/test/rcd_test/Rakefile

@@ -66,7 +66,7 @@ namespace "gem" do
         # - and to bundle the rake-compiler-dock under test
         RakeCompilerDock.sh <<-EOT, platform: plat, mountdir: Dir.pwd + "/../..", verbose: true
           (cp tmp/gem/gem-*.pem ~/.gem/ || true) &&
-          bundle --local &&
+          bundle install --local &&
           rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem "MAKE=make V=1" #{config}
         EOT
       end
@@ -79,7 +79,7 @@ namespace "gem" do
     sh "bundle package"
     RakeCompilerDock.sh <<-EOT, rubyvm: "jruby", platform: "jruby", mountdir: Dir.pwd + "/../..", verbose: true
       mvn archetype:generate -DartifactId=test -DarchetypeVersion=1.4 -DinteractiveMode=false -DgroupId=test -Dpackage=test &&
-      bundle --local &&
+      bundle install --local &&
       bundle exec rake java gem
     EOT
   end

metadata

@@ -1,37 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc1
+  version: 1.11.1
 platform: ruby
 authors:
 - Lars Kanis
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
-  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDEyMjkxOTU2NTZaFw0yNTEy
-  MjkxOTU2NTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
-  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
-  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
-  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
-  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
-  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
-  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
-  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
-  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
-  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
-  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
-  7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAoZZWzNV2XXaoSmvyamSSN+Wt/Ia+DNrU
-  2pc3kMEqykH6l1WiVPszr6HavQ//2I2UcSRSS5AGDdiSXcfyFmHtMBdtJHhTPcn7
-  4DLliB0szpvwG+ltGD8PI8eWkLaTQeFzs+0QCTavgKV+Zw56Q0J5zZvHHUMrLkUD
-  qhwKjdTdkrRTn9Sqi0BrIRRZGTUDdrt8qoWm35aES5arKZzytgrRD/kXfFW2LCg0
-  FzgTKibR4/3g8ph94kQLg/D2SMlVPkQ3ECi036mZxDC2n8V6u3rDkG5923wmrRZB
-  J6cqz475Q8HYORQCB68OPzkWMfC7mBo3vpSsIqRoNs1FE4FJu4FGwZG8fBSrDC4H
-  bZe+GtyS3e2SMjgT65zp35gLO9I7MquzYN9P6V2u1iBpTycchk5z9R1ghxzZSBT8
-  DrkJ9tVlPQtJB0LqT0tvBap4upnwT1xYq721b5dwH6AF4Pi6iz/dc5vnq1/MH8bV
-  8VbbBzzeE7MsvgkP3sHlLmY8PtuyViJ8
-  -----END CERTIFICATE-----
+cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -171,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.