rake-compiler-dock 1.3.1 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0330e7e3a9c83585df7ce3f77b4abfef615a7b86fbd9bf0da5a7f9bdf562acd3
-  data.tar.gz: c48c0b411ab4f3e6d52f475af134715976af211fbf5bd3379c5f4cadcc5af467
+  metadata.gz: b51824ca3f8d8154a7ff22e08ed20953bb77731242d145af462ae198f3900f85
+  data.tar.gz: 1ec5c570ea206a0320a3b6aa9254cc70a53f7e59e24a94b9753bce96a088f8f5
 SHA512:
-  metadata.gz: 31aa3a2b77ff3572270ee64dcad2c9a7606b26638103ef2b1879cafc5a9bf79aff43c1ea0a139020956b8256e16acd15388b068b3efe60acabe5d7ad1096e929
-  data.tar.gz: 9a7ed2d9d49fab243c038ff094d4781f10608fed2c0a99745e31277c2946f659672f059d43da4a2cb48057b76ddd15b89978530d7435409c6fcc03e2add6a595
+  metadata.gz: 7416974cb6181d737adda2e60ce217bbe66b349f0f195498c7a37374de48b43cd83881f1457378d49854a6e23bec9e84ac5f604afe0606db8bd4ea808f505ba4
+  data.tar.gz: b92e1eb19c5c19672c5ec8e5c77fac6d09f4c1e65fbc1895cbf402130fa4fc2162b510d4cbc118a55d0bade597a935b294f921ba6e097ecf3a7ebff23c54b875

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.2 && \
+      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.2"
+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.2 && \
-        echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.2.2/*.patch && \
-        ( git apply /home/rvm/patches/rake-compiler-1.2.2/*.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 %>
 
@@ -262,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,3 +1,10 @@
+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
 ------------------
 

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/lib/rake_compiler_dock/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,7 @@ 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.2/0004-Enable-build-of-static-libruby.patch
+- build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch
 - build/rcd-env.sh
 - build/runas
 - build/sigfw.c
@@ -137,9 +137,9 @@ 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.19
 signing_key: