rake-compiler-dock 1.3.0 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c53a8e4fde2b4ad57875b1e8ca11037cb9d9f101b451aaea52cdcef60dc56c
-  data.tar.gz: 9be653f556704bc9725aeec603c45a83491f62dd71b7e5b5e4eccd1635864a4a
+  metadata.gz: b51824ca3f8d8154a7ff22e08ed20953bb77731242d145af462ae198f3900f85
+  data.tar.gz: 1ec5c570ea206a0320a3b6aa9254cc70a53f7e59e24a94b9753bce96a088f8f5
 SHA512:
-  metadata.gz: 0c56bc4e310a1b5eb278ceb1da8b06a6bdbea9be2ddd6acf3be2c509afe60f542b8171e1c88cdcc6df9e21087028d91df1b46763f15c571d8ca71d4be6fdddc7
-  data.tar.gz: 2b2a2504d952cfe709cf0dece45d8ef7c83ac768af42eac27ec888a36c913c9e5d2b07f0e90bdb839945d3d4570b6ada0abb01b797e1e6a5249a521c83d59a88
+  metadata.gz: 7416974cb6181d737adda2e60ce217bbe66b349f0f195498c7a37374de48b43cd83881f1457378d49854a6e23bec9e84ac5f604afe0606db8bd4ea808f505ba4
+  data.tar.gz: b92e1eb19c5c19672c5ec8e5c77fac6d09f4c1e65fbc1895cbf402130fa4fc2162b510d4cbc118a55d0bade597a935b294f921ba6e097ecf3a7ebff23c54b875

data/.dockerignore

@@ -0,0 +1,2 @@
+cache/
+cache*.tar

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
     - cron: "0 5 * * 3" # At 05:00 on Wednesday # https://crontab.guru/#0_5_*_*_3
   push:
     branches:
-      - master
+      - main
     tags:
       - "*.*.*"
   pull_request:
@@ -120,6 +120,7 @@ jobs:
         os:
           - ubuntu
         ruby:
+          - "head" # 3.3
           - "3.2"
           - "3.1"
           - "3.0"
@@ -156,6 +157,7 @@ jobs:
           - macos
           - ubuntu
         ruby:
+          - "head" # 3.3
           - "3.2"
           - "3.1"
           - "3.0"
@@ -179,11 +181,16 @@ jobs:
           - os: windows
             ruby: "3.2"
             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: "head"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -213,6 +220,7 @@ jobs:
         os:
           - windows
         ruby:
+          - "head" # 3.3
           - "3.2"
           - "3.1"
           - "3.0"
@@ -229,11 +237,16 @@ jobs:
           - os: windows
             ruby: "3.2"
             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: "head"
 
     runs-on: ${{ matrix.os }}-latest
     steps:

data/CONTRIBUTING.md

@@ -2,6 +2,23 @@
 
 This document is intended for the rake-compiler-dock contributors.
 
+## Cutting a release
+
+- prep
+  - [x] make sure CI is green!
+  - [x] update `History.md` and `lib/rake_compiler_dock/version.rb`
+- build
+  - [-] run the steps below to generate the images locally
+  - [x] run `gem build rake-compiler-dock`
+  - [ ] create a git tag
+- push
+  - [ ] run `git push && git push --tags`
+  - [ ] run `bundle exec rake release:images`
+  - [ ] run `gem push rake-compiler-dock*gem`
+- announce
+  - [ ] create a release at https://github.com/rake-compiler/rake-compiler-dock/releases
+
+
 ## Building a versioned image
 
 We want to preserve the cache if we can, so patch releases don't change _all_ the layers. There are a few ways to do this.

data/Dockerfile.jruby

@@ -39,7 +39,7 @@ RUN bash -c " \
       rvm all do gem update --system --no-document && \
       rvm all do gem update --no-document && \
       rvm all do gem install bundler --no-document && \
-      rvm all do gem install --no-document rake-compiler:1.2.1 && \
+      rvm all do gem install --no-document rake-compiler:1.2.5 && \
       find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
     "
 

data/Dockerfile.mri.erb

@@ -114,7 +114,7 @@ RUN /home/rvm/mk_osxcross.sh
 ##
 USER rvm
 
-RUN bash -c "rvm all do gem install --no-document rake-compiler:1.2.1"
+RUN bash -c "rvm all do gem install --no-document rake-compiler:1.2.5"
 
 # Install rake-compiler's cross rubies in global dir instead of /root
 RUN sudo mkdir -p /usr/local/rake-compiler && \
@@ -125,39 +125,43 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 COPY build/patches2 /home/rvm/patches/
 RUN bash -c " \
       for v in ${RVM_RUBIES} ; do \
-        cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.2.1 && \
-        echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.2.1/*.patch && \
-        ( git apply /home/rvm/patches/rake-compiler-1.2.1/*.patch || true ) \
+        cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.2.5 && \
+        echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.2.5/*.patch && \
+        ( git apply /home/rvm/patches/rake-compiler-1.2.5/*.patch || true ) \
       done \
     "
 
 <%
+#
+# Build ruby versions prior to ruby2_keywords using ruby-2.5
+# Build ruby versions with ruby2_keywords using ruby-3.x
+#
+# Note that parallel builds of ruby with make flag `-j` are often flaky, see
+# https://bugs.ruby-lang.org/issues/18506
+#
 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-preview3:3.2.0:3.1.0", "3.1.3"],
   ]
 elsif platform =~ /x64-mingw32/
   [
     # Rubyinstaller prior to 3.1.0 is platform x64-mingw32
-    ["2.6.0:2.5.0:2.4.0", "2.5.9", false],
-    ["3.0.0:2.7.0", "3.1.3", true],
+    ["2.6.0:2.5.0:2.4.0", "2.5.9"],
+    ["3.0.0:2.7.0", "3.1.3"],
   ]
 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],
+    ["2.6.0:2.5.0:2.4.0", "2.5.9"],
+    ["3.3.0-preview3:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
   ]
 end
 
-axrubies.each do |xrubies, rvm, parallel| %>
+axrubies.each do |xrubies, rvm| %>
 ENV XRUBIES <%= xrubies %>
 
 <% strip = '-s' if platform !~ /darwin/ %>
-# Build xruby versions in parallel
-# Then cleanup all build artifacts
+# Build xruby versions, then cleanup all build artifacts
 RUN bash -c " \
       rvm use <%= rvm %> && \
       export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform=~/x64-mingw-ucrt/ %>' && \
@@ -165,7 +169,7 @@ RUN bash -c " \
       export LDFLAGS='-pipe <%= strip %>' && \
       <%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
       <%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \
-      export MAKE='make V=1 <%= "-j`nproc`" if parallel %>' && \
+      export MAKE='make V=1' && \
       rake-compiler cross-ruby VERSION=$XRUBIES HOST=<%= target %> && \
       rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
       find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
@@ -194,8 +198,11 @@ 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
+# - note that we do this for "3.[2-9].0" to match rubies 3.2 and later
+# - and we add a "*" on the end for "3.[2-9].0*" to match prereleases like "3.3.0+0"
+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 %>
 
@@ -209,9 +216,9 @@ RUN sed -i -- "s:/root/.rake-compiler:/usr/local/rake-compiler:g" /usr/local/rak
 
 <% if platform=~/mingw/ %>
 # Install wrappers for strip commands as a workaround for "Protocol error" in boot2docker.
-COPY build/strip_wrapper /root/
+COPY build/strip_wrapper_vbox /root/
 RUN mv /usr/bin/<%= target %>-strip /usr/bin/<%= target %>-strip.bin && \
-    ln /root/strip_wrapper /usr/bin/<%= target %>-strip
+    ln /root/strip_wrapper_vbox /usr/bin/<%= target %>-strip
 
 # Use posix pthread for mingw so that C++ standard library for thread could be
 # available such as std::thread, std::mutex, so on.
@@ -220,6 +227,13 @@ RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
     printf "1\n" | update-alternatives --config <%= target %>-g++
 <% end %>
 
+<% if platform =~ /darwin/ %>
+# Install wrapper around strip to re-sign binaries (ad-hoc signature)
+COPY build/strip_wrapper_codesign /root/
+RUN mv /opt/osxcross/target/bin/<%= target %>-strip /opt/osxcross/target/bin/<%= target %>-strip.bin && \
+    ln /root/strip_wrapper_codesign /opt/osxcross/target/bin/<%= target %>-strip
+<% end %>
+
 <% if manylinux %>
 # Enable modern compiler toolset of manylinux image
 RUN echo "export PATH=\$DEVTOOLSET_ROOTPATH/usr/bin:\$PATH" >> /etc/rubybashrc
@@ -255,6 +269,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

data/History.md

@@ -1,4 +1,18 @@
-1.3.0 / 2022-01-11
+1.4.0.rc1 / 2023-11-26
+-----------------
+
+* Add Ruby 3.3.0-preview3 cross-compilation support. #105 (@flavorjones)
+* Update to rake-compiler 1.2.5. #108 (@flavorjones)
+
+
+1.3.1 / 2023-10-14
+------------------
+
+* In the container, `strip` will re-codesign binaries on darwin. #104 (@flavorjones)
+* Update to rake-compiler 1.2.2. #101 (@flavorjones)
+
+
+1.3.0 / 2023-01-11
 ------------------
 
 * Add Ruby 3.2 cross-compilation support.

data/README.md

@@ -221,7 +221,7 @@ For an example of rake tasks that support this style of invocation, visit https:
 
 ### Living on the edge: using weekly snapshots
 
-OCI images snapshotted from `master` are published weekly to Github Container Registry with the string "snapshot" in place of the version number in the tag name, e.g.:
+OCI images snapshotted from `main` are published weekly to Github Container Registry with the string "snapshot" in place of the version number in the tag name, e.g.:
 
 - `ghcr.io/rake-compiler/rake-compiler-dock-image:snapshot-mri-x86_64-linux`
 

data/Rakefile

@@ -4,6 +4,8 @@ require "rake_compiler_dock"
 require_relative "build/gem_helper"
 require_relative "build/parallel_docker_build"
 
+CLEAN.include("tmp")
+
 RakeCompilerDock::GemHelper.install_tasks
 
 platforms = [

data/build/mk_osxcross.sh

@@ -36,3 +36,8 @@ find /opt/osxcross/target/bin/ -name '*-apple-darwin[0-9]*' | sort | while read
 # There's no objdump in osxcross but we can use llvm's
 ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/x86_64-apple-darwin-objdump
 ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/aarch64-apple-darwin-objdump
+
+# install /usr/bin/codesign and make a symlink for codesign_allocate (the architecture doesn't matter)
+git clone -q --depth=1 https://github.com/flavorjones/sigtool --branch flavorjones-fix-link-line-library-order
+make -C sigtool install
+ln -s /opt/osxcross/target/bin/x86_64-apple-darwin[0-9]*-codesign_allocate /usr/bin/codesign_allocate

data/build/parallel_docker_build.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "rake"
+require "digest/sha1"
 
 module RakeCompilerDock
   class << self
@@ -92,7 +93,7 @@ module RakeCompilerDock
     # This also adds dependant intermediate tasks as prerequisites.
     def define_common_tasks(vcs, workdir, task_prefix, plines=[])
       vcs.map do |files, (lines, nvcs)|
-        fn = "#{task_prefix}#{files.join}"
+        fn = "#{task_prefix}#{Digest::SHA1.hexdigest(files.join)}"
         File.write(File.join(workdir, fn), (plines + lines).join)
         task fn do
           docker_build(fn, workdir)

data/build/strip_wrapper_codesign

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# Stripping a signed Mach-O binary will invalidate the signature. To mimic what strip does on native
+# Darwin, we install this wrapper to re-sign the binary after stripping it.
+
+files = ARGV.reject { |f| f=~/^-/ }
+
+strip = "#{File.basename($0)}.bin"
+strip_options = ARGV.select{|f| f=~/^-/ }
+strip_arguments = [strip] + strip_options + files
+
+codesign = "codesign" # installed into /usr/bin by mk_osxcross.sh
+codesign_options = ["-f", "-s-"]
+codesign_arguments = [codesign] + codesign_options + files
+
+system(*strip_arguments, exception: true)
+system(*codesign_arguments, exception: true)

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.3.0"
-  IMAGE_VERSION = "1.3.0"
+  VERSION = "1.4.0.rc1"
+  IMAGE_VERSION = "1.4.0.rc1"
 end

data/test/rcd_test/ext/mri/extconf.rb

@@ -92,4 +92,18 @@ else
   end
 
   create_makefile("rcd_test/rcd_test_ext")
+
+  # exercise the strip command - this approach borrowed from grpc
+  strip_tool = RbConfig::CONFIG['STRIP']
+  strip_tool += ' -x' if RUBY_PLATFORM =~ /darwin/
+  File.open('Makefile.new', 'w') do |o|
+    o.puts 'hijack: all strip'
+    o.puts
+    o.write(File.read('Makefile'))
+    o.puts
+    o.puts 'strip: $(DLLIB)'
+    o.puts "\t$(ECHO) Stripping $(DLLIB)"
+    o.puts "\t$(Q) #{strip_tool} $(DLLIB)"
+  end
+  File.rename('Makefile.new', 'Makefile')
 end

data/test/test_parallel_docker_build.rb

@@ -38,19 +38,23 @@ class TestParallelDockerBuild < Test::Unit::TestCase
     FileUtils.rm_rf @tmpdir
   end
 
+  private def hd(str)
+    "y" + Digest::SHA1.hexdigest(str)
+  end
+
   def test_tasks
     Dir.chdir(@tmpdir) do
       RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
     end
 
-    assert_operator Rake::Task["File0"].prerequisites, :include?, "yFile0File1"
-    assert_operator Rake::Task["File1"].prerequisites, :include?, "yFile1"
-    assert_operator Rake::Task["yFile1"].prerequisites, :include?, "yFile0File1"
-    assert_operator Rake::Task["yFile0File1"].prerequisites, :include?, "yFile0File1File2File3"
+    assert_operator Rake::Task["File0"].prerequisites, :include?, hd("File0File1")
+    assert_operator Rake::Task["File1"].prerequisites, :include?, hd("File1")
+    assert_operator Rake::Task[hd "File1"].prerequisites, :include?, hd("File0File1")
+    assert_operator Rake::Task[hd "File0File1"].prerequisites, :include?, hd("File0File1File2File3")
 
-    assert_operator Rake::Task["File2"].prerequisites, :include?, "yFile2File3"
-    assert_operator Rake::Task["File3"].prerequisites, :include?, "yFile2File3"
-    assert_operator Rake::Task["yFile2File3"].prerequisites, :include?, "yFile0File1File2File3"
+    assert_operator Rake::Task["File2"].prerequisites, :include?, hd("File2File3")
+    assert_operator Rake::Task["File3"].prerequisites, :include?, hd("File2File3")
+    assert_operator Rake::Task[hd "File2File3"].prerequisites, :include?, hd("File0File1File2File3")
   end
 
   def test_common_files
@@ -58,10 +62,10 @@ class TestParallelDockerBuild < Test::Unit::TestCase
       RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
     end
 
-    assert_equal "FROM a\nRUN a\nRUN d\nRUN f \\\ng\n", read_df("yFile1")
-    assert_equal "FROM a\nRUN a\nRUN d\n", read_df("yFile0File1")
-    assert_equal "FROM a\nRUN b\nRUN c\nRUN d\n", read_df("yFile2File3")
-    assert_equal "FROM a\n", read_df("yFile0File1File2File3")
+    assert_equal "FROM a\nRUN a\nRUN d\nRUN f \\\ng\n", read_df(hd "File1")
+    assert_equal "FROM a\nRUN a\nRUN d\n", read_df(hd "File0File1")
+    assert_equal "FROM a\nRUN b\nRUN c\nRUN d\n", read_df(hd "File2File3")
+    assert_equal "FROM a\n", read_df(hd "File0File1File2File3")
   end
 
   def read_df(fn)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".github/workflows/ci.yml"
 - ".github/workflows/publish-images.yml"
 - ".gitignore"
@@ -87,12 +88,12 @@ files:
 - build/parallel_docker_build.rb
 - build/patches/ruby-2.5.9/no_sendfile.patch
 - build/patches/ruby-3.1.3/no_sendfile.patch
-- build/patches2/rake-compiler-1.2.1/0004-Enable-build-of-static-libruby.patch
-- build/patches2/rake-compiler-1.2.1/0005-make-miniruby.patch
+- build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch
 - build/rcd-env.sh
 - build/runas
 - build/sigfw.c
-- build/strip_wrapper
+- build/strip_wrapper_codesign
+- build/strip_wrapper_vbox
 - build/sudoers
 - lib/rake_compiler_dock.rb
 - lib/rake_compiler_dock/colors.rb
@@ -136,11 +137,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows

data/build/patches2/rake-compiler-1.2.1/0005-make-miniruby.patch

@@ -1,19 +0,0 @@
-fix(temp): rake-compiler explicitly builds miniruby first
-
-See https://bugs.ruby-lang.org/issues/19239 for the upstream bug
-report.
-
-TODO: This patch can be removed if that's fixed in a 3.2.0 final release.
-
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 8317a2a..d9bfe4c 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -129,6 +129,7 @@
- 
-     # make
-     file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
-+      sh "#{MAKE} miniruby", chdir: File.dirname(t.prerequisites.first)
-       sh MAKE, chdir: File.dirname(t.prerequisites.first)
-     end
-