rake-compiler-dock 1.11.1 → 1.12.0

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
-## next / unreleased
-
-...
+## 1.12.0 / 2026-04-15
+
+- Fix `gem install rdoc` which failed due to insufficient permissions. #187 #192 @larskanis @flavorjones
+- Fix musl cross-compiler build by removing dead mirror URL for linux-headers. @flavorjones
+- Bump Ruby 4.0 to v4.0.2 (from v4.0.0). @marcoroth @flavorjones
+- Bump Ruby 3.4 to v3.4.9 (from v3.4.8). @flavorjones
+- Bump Ruby 3.3 to v3.3.11 (from v3.3.10). @flavorjones
+- Bump Ruby 3.2 to v3.2.11 (from v3.2.9). @marcoroth @flavorjones
 
 
 ## 1.11.1 / 2025-12-26

data/Dockerfile.mri.erb

@@ -39,7 +39,7 @@ ENV BASH_ENV=/etc/rubybashrc
 ##
 USER rubyuser
 
-ENV RBENV_RUBIES="3.1.7 4.0.0"
+ENV RBENV_RUBIES="3.1.7 4.0.2"
 
 # Install the bootstrap rubies
 RUN bash -c " \
@@ -48,7 +48,8 @@ RUN bash -c " \
   for v in ${RBENV_RUBIES} ; do \
     rbenv install \$v -- --disable-install-doc ; \
   done && \
-  find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+w \
+  find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+w && \
+  find ${RBENV_ROOT} -path '*/plugins/*.rb' -print0 | sudo xargs -0 chmod g+w \
 "
 
 # Install rake-compiler and patch it to build and install static libraries for Linux rubies
@@ -151,12 +152,12 @@ USER rubyuser
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1+ is platform x64-mingw-ucrt
-    ["3.3.10:3.2.9:3.1.7", "3.1.7"],
-    ["4.0.0:3.4.8", "4.0.0"],
+    ["3.3.11:3.2.11:3.1.7", "3.1.7"],
+    ["4.0.2:3.4.9", "4.0.2"],
   ]
 elsif platform =~ /aarch64-mingw-ucrt/
   [
-    ["4.0.0:3.4.8", "4.0.0"],
+    ["4.0.2:3.4.9", "4.0.2"],
   ]
 elsif platform =~ /x64-mingw32/
   [
@@ -166,13 +167,13 @@ elsif platform =~ /x64-mingw32/
 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"],
+    ["3.3.11:3.2.11:3.1.7:3.0.7", "3.1.7"],
+    ["3.4.9", "4.0.2"],
   ]
 else
   [
-    ["3.3.10:3.2.9:3.1.7:3.0.7", "3.1.7"],
-    ["4.0.0:3.4.8", "4.0.0"],
+    ["3.3.11:3.2.11:3.1.7:3.0.7", "3.1.7"],
+    ["4.0.2:3.4.9", "4.0.2"],
   ]
 end
 
@@ -274,8 +275,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 4.0.0"
+RUN bash -c "rbenv global 4.0.2"
 
-ENV RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7
+ENV RUBY_CC_VERSION=4.0.2:3.4.9:3.3.11:3.2.11:3.1.7:3.0.7
 
 CMD bash

data/Rakefile

@@ -135,6 +135,17 @@ namespace :release do
     multitask :images => platform
   end
 
+  # Add a manifest for automatic selection of ARM64 or X86_64 host image
+  task :manifests do
+    platforms.each do |platform,|
+      tag = RakeCompilerDock::Starter.container_image_name(platform: platform)
+      sh "docker buildx imagetools create -t #{tag} #{tag}-ARM64 #{tag}-X64"
+      if tag.include?("linux-gnu")
+        sh "docker buildx imagetools create -t #{tag.sub("linux-gnu", "linux")} #{tag}-ARM64 #{tag}-X64"
+      end
+    end
+  end
+
   desc "Show download sizes of the release images"
   task :sizes do
     require "yaml"

data/build/mk_musl_cross.sh

@@ -29,7 +29,7 @@ GCC_CONFIG += --disable-libquadmath --disable-decimal-float
 GCC_CONFIG += --disable-multilib
 EOF
 
-make -j$(nproc) install LINUX_HEADERS_SITE=http://mirrors.2f30.org/sabotage/tarballs/
+make -j$(nproc) install
 
 popd
 

data/build/parallel_docker_build.rb

@@ -40,6 +40,12 @@ module RakeCompilerDock
     attr_reader :tree_deps
     attr_reader :final_deps
 
+    # All intermediate build nodes, including isolated ones with no tree dependencies.
+    # Use this instead of tree_deps when iterating all CI build jobs.
+    def all_deps
+      file_deps.keys
+    end
+
     def initialize(dockerfiles, workdir: "tmp/docker", inputdir: ".", task_prefix: "common-")
       FileUtils.mkdir_p(workdir)
 

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.11.1"
-  IMAGE_VERSION = "1.11.1"
+  VERSION = "1.12.0"
+  IMAGE_VERSION = "1.12.0"
 end

data/lib/rake_compiler_dock.rb

@@ -82,20 +82,19 @@ module RakeCompilerDock
   #
   #   RakeCompilerDock.cross_rubies
   #   # => {
-  #   #      "3.4" => "3.4.8",
-  #   #      "3.3" => "3.3.10",
-  #   #      "3.2" => "3.2.9",
+  #   #      "3.4" => "3.4.9",
+  #   #      "3.3" => "3.3.11",
+  #   #      "3.2" => "3.2.11",
   #   #      "3.1" => "3.1.7",
   #   #      "3.0" => "3.0.7",
-  #   #      "2.7" => "2.7.8",
   #   #    }
   #
   def cross_rubies
     {
-      "4.0" => "4.0.0",
-      "3.4" => "3.4.8",
-      "3.3" => "3.3.10",
-      "3.2" => "3.2.9",
+      "4.0" => "4.0.2",
+      "3.4" => "3.4.9",
+      "3.3" => "3.3.11",
+      "3.2" => "3.2.11",
       "3.1" => "3.1.7",
       "3.0" => "3.0.7",
     }
@@ -111,14 +110,14 @@ module RakeCompilerDock
   # Note that the returned string will contain versions sorted in descending order.
   #
   # For example:
-  #   RakeCompilerDock.ruby_cc_version("2.7", "3.4")
-  #   # => "3.4.8:2.7.8"
+  #   RakeCompilerDock.ruby_cc_version("3.0", "3.4")
+  #   # => "3.4.9:3.0.7"
   #
   #   RakeCompilerDock.ruby_cc_version("~> 3.2")
-  #   # => "3.4.8:3.3.10:3.2.9"
+  #   # => "3.4.9:3.3.11:3.2.11"
   #
   #   RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2"))
-  #   # => "3.4.8:3.3.10:3.2.9"
+  #   # => "3.4.9:3.3.11:3.2.11"
   #
   def ruby_cc_version(*requirements)
     cross = cross_rubies

data/test/test_parallel_docker_build.rb

@@ -68,6 +68,27 @@ class TestParallelDockerBuild < Test::Unit::TestCase
     assert_equal "FROM a\n", read_df(hd "File0File1File2File3")
   end
 
+  def test_all_deps_includes_isolated_file
+    # File5 shares no common prefix with File0-File3, simulating the jruby Dockerfile
+    # which shares no common layers with MRI Dockerfiles.
+    Dir.chdir(@tmpdir) do
+      File.write "File5", <<-EOT
+      FROM b
+      RUN x
+      EOT
+    end
+
+    pdb = Dir.chdir(@tmpdir) do
+      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 File5 ], task_prefix: "y")
+    end
+
+    file5_final_dep = pdb.final_deps["File5"]
+    assert_not_nil file5_final_dep
+
+    assert_operator pdb.all_deps, :include?, file5_final_dep,
+      "all_deps should include every final_dep value so CI generates build jobs for all images"
+  end
+
   def read_df(fn)
     File.read(File.join(@tmpdir, "/tmp/docker", fn)).each_line.map(&:lstrip).join
   end

data/test/test_rubygems_plugins.rb

@@ -0,0 +1,12 @@
+require 'rake_compiler_dock'
+require 'test/unit'
+
+class TestRubygemsPlugins < Test::Unit::TestCase
+  TEST_PLATFORM = ENV["TEST_PLATFORM"] || 'x86_64-linux'
+
+  def test_gem_inst_with_plugin
+    # This verifies that gem install doesn't fail due to insufficient permissions to some rubygems plugin file like:
+    #   /usr/local/rbenv/versions/4.0.0/lib/ruby/gems/4.0.0/plugins/rdoc_plugin.rb
+    RakeCompilerDock::Starter.sh "gem inst --silent rdoc gem-wrappers", platform: TEST_PLATFORM, verbose: false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Lars Kanis
@@ -126,6 +126,7 @@ files:
 - test/test_environment_variables.rb
 - test/test_mig.rb
 - test/test_parallel_docker_build.rb
+- test/test_rubygems_plugins.rb
 - test/test_starter.rb
 - test/test_versions.rb
 homepage: https://github.com/rake-compiler/rake-compiler-dock
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.
@@ -167,5 +168,6 @@ test_files:
 - test/test_environment_variables.rb
 - test/test_mig.rb
 - test/test_parallel_docker_build.rb
+- test/test_rubygems_plugins.rb
 - test/test_starter.rb
 - test/test_versions.rb