rake-compiler-dock 1.10.0 → 1.11.0.rc1

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
-## 1.10.1 / 2025-10-25
+## 1.11.0.rc1 / 2025-12-18
+
+### Changes
+
+- Add Ruby 4.0.0-preview2 cross-compilation support. @flavorjones
+- Bump Ruby 3.3 to v3.3.10 (from v3.3.9) @flavorjones
+- Bump Ruby 3.4 to v3.4.8 (from v3.4.5) @flavorjones
+- Bump rake-compiler dependency to v1.3.1 (from v1.2.9) @flavorjones
+- The default `rbenv` ruby in the container is now Ruby v3.4.8 (previously the default was 3.4.5).
+- Optimized images by improving layer sharing. @larskanis
+
+### CRuby container summary
+
+- native rubies: 4.0.0-preview2, 3.4.8 (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:2.7.8`
+
+
+## 1.10.0 / 2025-10-25
+
+### Changes
 
 - Add support for ARM64 host images and release rake-compiler-dock host images for ARM64 and x86_64. #140
 - Add new target platform `aarch64-mingw-ucrt` aka Windows on ARM. #152

data/Dockerfile.jruby

@@ -48,9 +48,9 @@ COPY build/patches /home/rubyuser/patches
 RUN bash -c " \
       for v in ${RBENV_RUBIES} ; do \
         rbenv shell \$v && \
-        gem install rake-compiler -v1.2.9 && \
-        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+        gem install rake-compiler -v1.3.1 && \
+        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.3.1 && \
+        for patch in /home/rubyuser/patches/rake-compiler-1.3.1/*.patch ; do \
           patch -p1 < \$patch ; \
         done \
       done \

data/Dockerfile.mri.erb

@@ -12,6 +12,65 @@ RUN apt-get -y update && \
     apt-get install -y autoconf cmake pkg-config zlib1g-dev libreadline-dev libsqlite0-dev libssl-dev libyaml-dev libffi-dev && \
     rm -rf /var/lib/apt/lists/*
 
+##
+##  install rbenv and ruby-build
+##
+RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
+
+ENV RBENV_ROOT=/usr/local/rbenv
+
+# chown after running `rbenv init` because that command creates some subdirectories
+RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
+    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    \
+    echo "export RBENV_ROOT=/usr/local/rbenv" >> /etc/rubybashrc && \
+    echo "export PATH=$RBENV_ROOT/bin:\$PATH" >> /etc/rubybashrc && \
+    $RBENV_ROOT/bin/rbenv init - --no-rehash bash >> /etc/rubybashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bash.bashrc && \
+    \
+    chown -R rubyuser:rubyuser ${RBENV_ROOT} && \
+    find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+sw
+ENV BASH_ENV=/etc/rubybashrc
+
+
+##
+##  set up rake-compiler and install bootstrap rubies
+##
+USER rubyuser
+
+ENV RBENV_RUBIES="3.1.7 3.4.8 4.0.0-preview2"
+
+# Install the bootstrap rubies
+RUN bash -c " \
+  echo 'gem: --no-ri --no-rdoc --no-document' >> ~/.gemrc && \
+  export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
+  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 \
+"
+
+# Install rake-compiler and patch it to build and install static libraries for Linux rubies
+COPY build/patches /home/rubyuser/patches
+RUN bash -c " \
+  for v in ${RBENV_RUBIES} ; do \
+    rbenv shell \$v && \
+    gem install rake-compiler -v1.3.1 && \
+    cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.3.1 && \
+    for patch in /home/rubyuser/patches/rake-compiler-1.3.1/*.patch ; do \
+      patch -p1 < \$patch ; \
+    done \
+  done \
+"
+
+# Install rake-compiler's cross rubies in global dir instead of /root
+RUN sudo mkdir -p /usr/local/rake-compiler && \
+    sudo chown rubyuser.rubyuser /usr/local/rake-compiler && \
+    ln -s /usr/local/rake-compiler ~/.rake-compiler
+
+USER root
+
 ##
 ## Install cross compilers
 ##
@@ -80,64 +139,8 @@ RUN git clone --branch=cross_platform https://github.com/markmentovai/bootstrap_
     rm -rf bootstrap_cmds
 <% end %>
 
-
-##
-##  install rbenv and ruby-build
-##
-RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
-
-ENV RBENV_ROOT=/usr/local/rbenv
-
-# chown after running `rbenv init` because that command creates some subdirectories
-RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
-    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    \
-    echo "export RBENV_ROOT=/usr/local/rbenv" >> /etc/rubybashrc && \
-    echo "export PATH=$RBENV_ROOT/bin:\$PATH" >> /etc/rubybashrc && \
-    $RBENV_ROOT/bin/rbenv init - --no-rehash bash >> /etc/rubybashrc && \
-    echo "source /etc/rubybashrc" >> /etc/bashrc && \
-    echo "source /etc/rubybashrc" >> /etc/bash.bashrc && \
-    \
-    chown -R rubyuser:rubyuser ${RBENV_ROOT} && \
-    find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+sw
-ENV BASH_ENV=/etc/rubybashrc
-
-
-##
-##  set up rake-compiler and install bootstrap rubies
-##
 USER rubyuser
 
-ENV RBENV_RUBIES="3.1.7 3.4.5"
-
-# Install the bootstrap rubies
-RUN bash -c " \
-  echo 'gem: --no-ri --no-rdoc --no-document' >> ~/.gemrc && \
-  export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-  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 \
-"
-
-# Install rake-compiler and patch it to build and install static libraries for Linux rubies
-COPY build/patches /home/rubyuser/patches
-RUN bash -c " \
-  for v in ${RBENV_RUBIES} ; do \
-    rbenv shell \$v && \
-    gem install rake-compiler -v1.2.9 && \
-    cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-    for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
-      patch -p1 < \$patch ; \
-    done \
-  done \
-"
-
-# Install rake-compiler's cross rubies in global dir instead of /root
-RUN sudo mkdir -p /usr/local/rake-compiler && \
-    sudo chown rubyuser.rubyuser /usr/local/rake-compiler && \
-    ln -s /usr/local/rake-compiler ~/.rake-compiler
-
 <%
 #
 # Build ruby versions with ruby2_keywords using ruby-3.x
@@ -148,11 +151,12 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1+ is platform x64-mingw-ucrt
-    ["3.4.5:3.3.9:3.2.9:3.1.7", "3.4.5"],
+    ["3.4.8:3.3.10:3.2.9:3.1.7", "3.4.8"],
+    ["4.0.0-preview2", "4.0.0-preview2"],
   ]
 elsif platform =~ /aarch64-mingw-ucrt/
   [
-    ["3.4.5", "3.1.7"],
+    ["3.4.8", "3.1.7"],
   ]
 elsif platform =~ /x64-mingw32/
   [
@@ -162,7 +166,8 @@ elsif platform =~ /x64-mingw32/
 else
   [
     ["2.7.8", "3.1.7"],
-    ["3.4.5:3.3.9:3.2.9:3.1.7:3.0.7", "3.4.5"],
+    ["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"],
   ]
 end
 
@@ -264,8 +269,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.5"
+RUN bash -c "rbenv global 3.4.8"
 
-ENV RUBY_CC_VERSION=3.4.5:3.3.9: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:2.7.8
 
 CMD bash

data/Rakefile

@@ -11,21 +11,19 @@ RakeCompilerDock::GemHelper.install_tasks
 def build_mri_images(platforms, host_platforms, output: )
   plats = host_platforms.map(&:first).join(",")
   platforms.each do |platform, _|
-    sdf = "tmp/docker/Dockerfile.mri.#{platform}.#{host_platforms.first[1]}"
+    sdf = "tmp/docker/Dockerfile.mri.#{platform}"
     image_name = RakeCompilerDock::Starter.container_image_name(platform: platform)
 
-    RakeCompilerDock.docker_build(sdf, tag: image_name, platform: plats, output: output)
-
-    if image_name.include?("linux-gnu")
-      RakeCompilerDock.docker_build(sdf, tag: image_name.sub("linux-gnu", "linux"), platform: plats, output: output)
-    end
+    tags = [image_name]
+    tags << image_name.sub("linux-gnu", "linux") if image_name.include?("linux-gnu")
+    RakeCompilerDock.docker_build(sdf, tag: tags, platform: plats, output: output)
   end
 end
 
 def build_jruby_images(host_platforms, output: )
   image_name = RakeCompilerDock::Starter.container_image_name(rubyvm: "jruby")
   plats = host_platforms.map(&:first).join(",")
-  sdf = "tmp/docker/Dockerfile.jruby.#{host_platforms.first[1]}"
+  sdf = "tmp/docker/Dockerfile.jruby"
   RakeCompilerDock.docker_build(sdf, tag: image_name, platform: plats, output: output)
 end
 
@@ -48,48 +46,56 @@ platforms = [
 ]
 
 host_platforms = [
-  # tuple is [docker platform, rake task, RUBY_PLATFORM matcher]
-  ["linux/amd64", "x86", /^x86_64|^x64|^amd64/],
-  ["linux/arm64", "arm", /^aarch64|arm64/],
+  # tuple is [docker platform, RUBY_PLATFORM matcher]
+  ["linux/amd64", /^x86_64|^x64|^amd64/],
+  ["linux/arm64", /^aarch64|arm64/],
 ]
-local_platform = host_platforms.find { |_,_,reg| reg =~ RUBY_PLATFORM } or
+local_platform = host_platforms.find { |_,reg| reg =~ RUBY_PLATFORM } or
     raise("RUBY_PLATFORM #{RUBY_PLATFORM} is not supported as host")
 
-namespace :build do
-
-  mkdir_p "tmp/docker"
+mkdir_p "tmp/docker"
 
-  docker_platform, rake_platform, _ = local_platform
-  platforms.each do |platform, target|
-    sdf = "tmp/docker/Dockerfile.mri.#{platform}.#{rake_platform}"
-    df = ERB.new(File.read("Dockerfile.mri.erb"), trim_mode: ">").result(binding)
-    File.write(sdf, df)
-    CLEAN.include(sdf)
-  end
-  sdf = "tmp/docker/Dockerfile.jruby.#{rake_platform}"
-  df = File.read("Dockerfile.jruby")
+docker_platform, _ = local_platform
+platforms.each do |platform, target|
+  sdf = "tmp/docker/Dockerfile.mri.#{platform}"
+  df = ERB.new(File.read("Dockerfile.mri.erb"), trim_mode: ">").result(binding)
   File.write(sdf, df)
+  CLEAN.include(sdf)
+end
+sdf = "tmp/docker/Dockerfile.jruby"
+df = File.read("Dockerfile.jruby")
+File.write(sdf, df)
 
-  RakeCompilerDock::ParallelDockerBuild.new(platforms.map{|pl, _| "tmp/docker/Dockerfile.mri.#{pl}.#{rake_platform}" } + ["tmp/docker/Dockerfile.jruby.#{rake_platform}"], workdir: "tmp/docker", task_prefix: "common-#{rake_platform}-", platform: docker_platform)
+parallel_docker_build = RakeCompilerDock::ParallelDockerBuild.new(platforms.map{|pl, _| "tmp/docker/Dockerfile.mri.#{pl}" } + ["tmp/docker/Dockerfile.jruby"], workdir: "tmp/docker", task_prefix: "common-")
+
+namespace :build do
+  parallel_docker_build.define_file_tasks platform: docker_platform
+
+  # The jobs in the CI pipeline are already organized in a tree structure.
+  # So we can avoid unnecessary rebuilds by omitting the dependecies.
+  unless ENV['RCD_TASK_DEPENDENCIES'] = "false"
+    parallel_docker_build.define_tree_tasks
+    parallel_docker_build.define_final_tasks
+  end
 
   platforms.each do |platform, target|
-    sdf = "tmp/docker/Dockerfile.mri.#{platform}.#{rake_platform}"
+    sdf = "tmp/docker/Dockerfile.mri.#{platform}"
 
     # Load image after build on local platform only
     desc "Build and load image for platform #{platform} on #{docker_platform}"
     task platform => sdf do
       build_mri_images([platform], [local_platform], output: 'load')
     end
-    multitask :all => platform
+    multitask :images => platform
   end
 
-  sdf = "tmp/docker/Dockerfile.jruby.#{rake_platform}"
+  sdf = "tmp/docker/Dockerfile.jruby"
   # Load image after build on local platform only
   desc "Build and load image for JRuby on #{docker_platform}"
   task :jruby => sdf do
     build_jruby_images([local_platform], output: 'load')
   end
-  multitask :all => :jruby
+  multitask :images => :jruby
 
   all_mri_images = platforms.map(&:first)
   desc "Build images for all MRI platforms in parallel"
@@ -102,14 +108,12 @@ namespace :build do
   all_images = all_mri_images + ["jruby"]
   desc "Build images for all platforms in parallel"
   if ENV['RCD_USE_BUILDX_CACHE']
-    task :all => all_images
+    task :images => all_images
   else
-    multitask :all => all_images
+    multitask :images => all_images
   end
 end
 
-task :build => "build:all"
-
 namespace :release do
   host_pl = host_platforms.map(&:first).join(",")
 
@@ -130,6 +134,48 @@ namespace :release do
     desc "Push all docker images on #{host_pl}"
     multitask :images => platform
   end
+
+  desc "Show download sizes of the release images"
+  task :sizes do
+    require "yaml"
+
+    ths = platforms.map do |pl, _|
+      image_name = RakeCompilerDock::Starter.container_image_name(platform: pl)
+      Thread.new do
+        [ pl,
+          IO.popen("docker manifest inspect #{image_name} -v", &:read)
+        ]
+      end
+    end
+
+    hlayers = Hash.new{|h,k| h[k] = {} }
+    isize_sums = Hash.new{|h,k| h[k] = 0 }
+
+    ths.map(&:value).each do |pl, ystr|
+      y = YAML.load(ystr)
+      y = [y] unless y.is_a?(Array)
+      y.each do |img|
+        next unless img
+        host_pl = "#{img.dig("Descriptor", "platform", "architecture")}-#{
+        img.dig("Descriptor", "platform", "os")}"
+        next if host_pl=="unknown-unknown"
+        lays = img.dig("OCIManifest", "layers") || img.dig("SchemaV2Manifest", "layers")
+        isize = lays.map do |lay|
+          hlayers[host_pl][lay["digest"]] = lay["size"]
+        end.sum
+        isize_sums[host_pl] += isize
+        puts format("%-15s %-20s:%12d MB", host_pl, pl, isize/1024/1024)
+      end
+    end
+    puts "----------"
+    isize_sums.each do |host_pl, isize|
+      puts format("%-15s %-20s:%12d MB", host_pl, "all-separate", isize/1024/1024)
+    end
+    hlayers.each do |host_pl, layers|
+      asize = layers.values.sum
+      puts format("%-15s %-20s:%12d MB", host_pl, "all-combined", asize/1024/1024)
+    end
+  end
 end
 
 namespace :prepare do
@@ -174,3 +220,16 @@ task :update_lists do
     EOT
   end
 end
+
+desc "Update CI publish workflows from erb"
+namespace :ci do
+  task :update_workflows do
+    erb = ERB.new(File.read(".github/workflows/publish-images.yml.erb"))
+    sdf = ".github/workflows/publish-images.yml"
+    release = false
+    File.write(sdf, erb.result(binding))
+    sdf = ".github/workflows/release-images.yml"
+    release = true
+    File.write(sdf, erb.result(binding))
+  end
+end

data/build/gem_helper.rb

@@ -17,7 +17,7 @@ module RakeCompilerDock
     end
 
     def headline
-      '([^\w]*)(\d+\.\d+\.\d+)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
+      '([^\w]*)(\d+\.\d+\.\d+(?:\.\w+)?)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
     end
 
     def reldate

data/build/parallel_docker_build.rb

@@ -25,7 +25,7 @@ module RakeCompilerDock
     def docker_build(filename, tag: nil, output: false, platform: )
       cmd = docker_build_cmd(platform)
       return if cmd.nil?
-      tag_args = ["-t", tag] if tag
+      tag_args = Array(tag).flat_map{|t| ["-t", t] } if tag
       push_args = ["--push"] if output == 'push'
       push_args = ["--load"] if output == 'load'
       Class.new.extend(FileUtils).sh(*cmd, "-f", filename, ".", "--platform", platform, *tag_args, *push_args)
@@ -36,7 +36,11 @@ module RakeCompilerDock
   class ParallelDockerBuild
     include Rake::DSL
 
-    def initialize(dockerfiles, workdir: "tmp/docker", inputdir: ".", task_prefix: "common-", platform: "local")
+    attr_reader :file_deps
+    attr_reader :tree_deps
+    attr_reader :final_deps
+
+    def initialize(dockerfiles, workdir: "tmp/docker", inputdir: ".", task_prefix: "common-")
       FileUtils.mkdir_p(workdir)
 
       files = parse_dockerfiles(dockerfiles, inputdir)
@@ -45,8 +49,11 @@ module RakeCompilerDock
       vcs = find_commons(files)
       # pp vcs
 
-      define_common_tasks(vcs, workdir, task_prefix)
-      @platform = platform
+      @file_deps = {}
+      @tree_deps = {}
+      @final_deps = {}
+
+      write_docker_files(vcs, workdir, task_prefix)
     end
 
     # Read given dockerfiles from inputdir and split into a list of commands.
@@ -100,27 +107,57 @@ module RakeCompilerDock
       end.compact.to_h
     end
 
-    # Write intermediate dockerfiles to workdir and define rake tasks
-    #
-    # The rake tasks are named after the dockerfiles given to #new .
-    # This also adds dependant intermediate tasks as prerequisites.
-    def define_common_tasks(vcs, workdir, task_prefix, plines=[])
+    # Write intermediate dockerfiles to workdir and fill properties
+    def write_docker_files(vcs, workdir, task_prefix, plines=[])
       vcs.map do |files, (lines, nvcs)|
-        fn = "#{task_prefix}#{Digest::SHA1.hexdigest(files.join)}"
-        File.write(File.join(workdir, fn), (plines + lines).join)
-        task fn do
-          RakeCompilerDock.docker_build(File.join(workdir, fn), platform: @platform)
+        fn = "#{task_prefix}#{Digest::SHA1.hexdigest(files.join)[0, 7]}"
+        wfn = File.join(workdir, fn)
+        File.write(wfn, (plines + lines).join)
+        @file_deps[fn] = wfn
+
+        files.each do |file|
+          @final_deps[file] = fn
         end
 
-        nfn = define_common_tasks(nvcs, workdir, task_prefix, plines + lines)
+        nfn = write_docker_files(nvcs, workdir, task_prefix, plines + lines)
         nfn.each do |file|
-          task file => fn
-        end
-        files.each do |file|
-          task file => fn
+          @tree_deps[file] = fn
         end
         fn
       end
     end
+
+    # Define rake tasks for building common docker files
+    #
+    # The rake tasks are named after the dockerfiles given to #new .
+    # This also adds dependant intermediate tasks as prerequisites.
+    def define_rake_tasks(**build_options)
+      define_file_tasks(**build_options)
+      define_tree_tasks
+      define_final_tasks
+    end
+
+    def define_file_tasks(**build_options)
+      file_deps.each do |fn, wfn|
+        # p file_deps: {fn => wfn}
+        task fn do
+          RakeCompilerDock.docker_build(wfn, **build_options)
+        end
+      end
+    end
+
+    def define_tree_tasks
+      tree_deps.each do |file, prereq|
+        # p tree_deps: {file => prereq}
+        task file => prereq
+      end
+    end
+
+    def define_final_tasks
+      final_deps.each do |file, prereq|
+        # p final_deps: {file => prereq}
+        task file => prereq
+      end
+    end
   end
 end

data/build/patches/{rake-compiler-1.2.9 → rake-compiler-1.3.1}/0004-Enable-build-of-static-libruby.patch

@@ -1,5 +1,5 @@
 diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 8317a2a3..8ed21718 100644
+index d37ab97b..4623896a 100644
 --- a/tasks/bin/cross-ruby.rake
 +++ b/tasks/bin/cross-ruby.rake
 @@ -116,11 +116,32 @@

data/build/patches/{rake-compiler-1.2.9 → rake-compiler-1.3.1}/0005-build-miniruby-first.patch

@@ -1,12 +1,11 @@
 diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index d37ab97b..0df44b30 100644
+index d37ab97b..512afbf4 100644
 --- a/tasks/bin/cross-ruby.rake
 +++ b/tasks/bin/cross-ruby.rake
-@@ -129,6 +129,12 @@
+@@ -129,6 +129,11 @@
  
      # make
      file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
-+      puts "MIKE: #{ruby_cc_version}: #{mingw_target}"
 +      if ruby_cc_version.start_with?("ruby-3.1") && mingw_target =~ /darwin/
 +        # for later 3.1.x releases, we need to explicitly build miniruby
 +        # see https://bugs.ruby-lang.org/issues/19239

data/build/patches/rake-compiler-1.3.1/0006-ruby-4-rubyspec-capiext.patch

@@ -0,0 +1,16 @@
+diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
+index 3d23eed6..904c12e0 100644
+--- a/tasks/bin/cross-ruby.rake
++++ b/tasks/bin/cross-ruby.rake
+@@ -150,6 +150,11 @@
+ 
+     # make
+     file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
++      if ruby_cc_version.start_with?("ruby-4.0")
++        # https://bugs.ruby-lang.org/issues/21792 - hopefully will be fixed by 4.0.0 final
++        FileUtils.rm_f("#{USER_HOME}/sources/#{ruby_cc_version}/spec/ruby/optional/capi/ext/digest_spec.c")
++      end
++
+       if ruby_cc_version.start_with?("ruby-3.1") && mingw_target =~ /darwin/
+         # for later 3.1.x releases, we need to explicitly build miniruby
+         # see https://bugs.ruby-lang.org/issues/19239

data/lib/rake_compiler_dock/version.rb

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

data/lib/rake_compiler_dock.rb

@@ -82,8 +82,8 @@ module RakeCompilerDock
   #
   #   RakeCompilerDock.cross_rubies
   #   # => {
-  #   #      "3.4" => "3.4.5",
-  #   #      "3.3" => "3.3.9",
+  #   #      "3.4" => "3.4.8",
+  #   #      "3.3" => "3.3.10",
   #   #      "3.2" => "3.2.9",
   #   #      "3.1" => "3.1.7",
   #   #      "3.0" => "3.0.7",
@@ -92,8 +92,9 @@ module RakeCompilerDock
   #
   def cross_rubies
     {
-      "3.4" => "3.4.5",
-      "3.3" => "3.3.9",
+      "4.0" => "4.0.0",
+      "3.4" => "3.4.8",
+      "3.3" => "3.3.10",
       "3.2" => "3.2.9",
       "3.1" => "3.1.7",
       "3.0" => "3.0.7",
@@ -112,13 +113,13 @@ module RakeCompilerDock
   #
   # For example:
   #   RakeCompilerDock.ruby_cc_version("2.7", "3.4")
-  #   # => "3.4.5:2.7.8"
+  #   # => "3.4.8:2.7.8"
   #
   #   RakeCompilerDock.ruby_cc_version("~> 3.2")
-  #   # => "3.4.5:3.3.9:3.2.9"
+  #   # => "3.4.8:3.3.10:3.2.9"
   #
   #   RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2"))
-  #   # => "3.4.5:3.3.9:3.2.9"
+  #   # => "3.4.8:3.3.10:3.2.9"
   #
   def ruby_cc_version(*requirements)
     cross = cross_rubies

data/test/test_parallel_docker_build.rb

@@ -39,12 +39,12 @@ class TestParallelDockerBuild < Test::Unit::TestCase
   end
 
   private def hd(str)
-    "y" + Digest::SHA1.hexdigest(str)
+    "y" + Digest::SHA1.hexdigest(str)[0, 7]
   end
 
   def test_tasks
     Dir.chdir(@tmpdir) do
-      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y").define_rake_tasks
     end
 
     assert_operator Rake::Task["File0"].prerequisites, :include?, hd("File0File1")

data/test/test_versions.rb

@@ -55,7 +55,7 @@ class TestVersions < Test::Unit::TestCase
     assert_equal(expected, RakeCompilerDock.ruby_cc_version("~> 3.2.0", "~> 3.4.0"))
     assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2.0"), Gem::Requirement.new("~> 3.4.0")))
 
-    expected = [cross["3.4"], cross["3.3"], cross["3.2"]].join(":")
+    expected = [cross["4.0"], cross["3.4"], cross["3.3"], cross["3.2"]].join(":")
     assert_equal(expected, RakeCompilerDock.ruby_cc_version(">= 3.2"))
     assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new(">= 3.2")))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Lars Kanis
@@ -95,6 +95,7 @@ files:
 - ".dockerignore"
 - ".github/workflows/ci.yml"
 - ".github/workflows/publish-images.yml"
+- ".github/workflows/publish-images.yml.erb"
 - ".github/workflows/release-images.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -113,8 +114,9 @@ files:
 - build/mk_osxcross.sh
 - build/mk_pkg_config.sh
 - build/parallel_docker_build.rb
-- build/patches/rake-compiler-1.2.9/0004-Enable-build-of-static-libruby.patch
-- build/patches/rake-compiler-1.2.9/0005-build-miniruby-first.patch
+- build/patches/rake-compiler-1.3.1/0004-Enable-build-of-static-libruby.patch
+- build/patches/rake-compiler-1.3.1/0005-build-miniruby-first.patch
+- build/patches/rake-compiler-1.3.1/0006-ruby-4-rubyspec-capiext.patch
 - build/rcd-env.sh
 - build/runas
 - build/sigfw.c