rake-compiler-dock 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e2b1ce6f914bd9b6449320d1c65bb5ac3cdd7f9afcf0189ee15a48e0bd8aac
-  data.tar.gz: 661f6b93c01a36993f89f121d1316d999c3e2f61fa7d577660a1e9d6a5898ff4
+  metadata.gz: 22fdbf0b0336450a55882dd000bea66c52a43325c6de59b0721ffbc6b5360576
+  data.tar.gz: 425f0ae751dfdcd3ff2936ff387c58b20d89e297d831c8c333ddd5738a9a92c2
 SHA512:
-  metadata.gz: 3a4639688aeeb8c3b6d0142fadcf6c088f86f3672aca2873df1af672b22b7cff93245905ac6b00aac0c4467f495a5df6d9309f3660bbf27ee8f98d3dc47d8b92
-  data.tar.gz: bbc042289e0ad041c42a5b6fd13ee55930546535505e59d310c11d7b9a0130718f5c84f78bc6b539437b58e1329ad2a5a2e082125fffeefd40f6173df739eab1
+  metadata.gz: 290f60e3969979b7830ab2a69c8989c484dbdf116fc76d9424a5efb71e5a1a4ab0bb834bc6504b3db3b383b76fbdb35ea070566d5118420ebfcf8b454a85a0a3
+  data.tar.gz: ab7a5180be028e305798032e35fc2070bce0ad882ace282ec21700b74552d35bf8a80dd2b660f9c66a8247605c11277eaf79c9ee338430b8ef4511bc945f1dfc

data/.github/workflows/ci.yml

@@ -2,7 +2,17 @@ name: Build docker images
 concurrency:
   group: "${{github.workflow}}-${{github.ref}}"
   cancel-in-progress: true
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    tags:
+      - "*.*.*"
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - "*"
 
 jobs:
   # These jobs use Buildx layer caching
@@ -12,17 +22,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - platform: x86-mingw32
-          - platform: x64-mingw-ucrt
-          - platform: x64-mingw32
-          - platform: x86-linux
-          - platform: x86_64-linux
-          - platform: x86_64-darwin
-          - platform: arm64-darwin
-          - platform: arm-linux
-          - platform: aarch64-linux
-          - platform: jruby
+        platform:
+          - x86-mingw32
+          - x64-mingw-ucrt
+          - x64-mingw32
+          - x86-linux
+          - x86_64-linux
+          - x86_64-darwin
+          - arm64-darwin
+          - arm-linux
+          - aarch64-linux
+          - jruby
 
     runs-on: ubuntu-latest
     env:
@@ -59,6 +69,7 @@ jobs:
           gem install -l rake-compiler-dock-*.gem
           cd test/rcd_test/
           bundle install
+          bundle exec rake clean clobber
           bundle exec rake gem:${PLATFORM}
 
       - name: Upload binary gem
@@ -67,63 +78,125 @@ jobs:
           name: gem-${{ matrix.platform }}
           path: test/rcd_test/pkg/*-*-*.gem
 
-      - name: Upload source gem
+      - if: matrix.platform == 'jruby'
+        name: Upload source gem
         uses: actions/upload-artifact@v2
-        if: matrix.platform == 'jruby'
         with:
           name: gem-ruby
           path: test/rcd_test/pkg/*-?.?.?.gem
 
+      - if: contains(matrix.platform, 'x64-mingw')
+        name: Build static rcd_test.gem
+        env:
+          RCD_TEST_CONFIG: "--link-static"
+        run: |
+          gem build rake-compiler-dock.gemspec
+          gem install -l rake-compiler-dock-*.gem
+          cd test/rcd_test/
+          bundle install
+          bundle exec rake clean clobber
+          bundle exec rake gem:${PLATFORM}
+
+      - if: contains(matrix.platform, 'x64-mingw')
+        name: Upload static binary gem
+        uses: actions/upload-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}-static
+          path: test/rcd_test/pkg/*-*-*.gem
 
   job_test_native:
-    name: Test
+    name: Test (${{matrix.ruby}}, ${{matrix.platform}})
     needs: docker_build
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - windows
+          - macos
+          - ubuntu
+        ruby:
+          - "3.1"
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+          - "2.4"
         include:
           - os: windows
-            ruby: "3.0"
-            platform: x64-mingw32
-          - os: windows
-            ruby: "2.4"
             platform: x64-mingw32
           - os: macos
-            ruby: "3.0"
-            platform: x86_64-darwin
-          - os: macos
-            ruby: "2.4"
             platform: x86_64-darwin
           - os: ubuntu
-            ruby: "3.0"
             platform: x86_64-linux
           - os: ubuntu
-            ruby: "2.4"
-            platform: x86_64-linux
+            platform: ruby
           - os: ubuntu
             ruby: jruby-head
             platform: jruby
-          - os: ubuntu
-            ruby: "3.0"
-            platform: ruby
+          - os: windows
+            ruby: "3.1"
+            platform: x64-mingw-ucrt
+        exclude:
+          - os: windows
+            ruby: "3.1"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
       - run: ruby --version
-
-      - name: Download gem from build job
+      - name: Download gem-${{matrix.platform}}
         uses: actions/download-artifact@v2
         with:
           name: gem-${{ matrix.platform }}
+      - name: Install gem-${{matrix.platform}}
+        run: gem install --local *.gem --verbose
+      - name: Run tests
+        run: |
+          cd test/rcd_test/
+          bundle install
+          ruby -rrcd_test -S rake test
 
-      - run: gem install --local *.gem --verbose
+  job_test_native_static:
+    name: Test static (${{matrix.ruby}}, ${{matrix.platform}})
+    needs: docker_build
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - windows
+        ruby:
+          - "3.1"
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+          - "2.4"
+        include:
+          - os: windows
+            platform: x64-mingw32
+          - os: windows
+            ruby: "3.1"
+            platform: x64-mingw-ucrt
+        exclude:
+          - os: windows
+            ruby: "3.1"
 
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: ruby --version
+      - name: Download gem-${{matrix.platform}}-static
+        uses: actions/download-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}-static
+      - name: Install gem-${{matrix.platform}}-static
+        run: gem install --local *.gem --verbose
       - name: Run tests
         run: |
           cd test/rcd_test/
@@ -131,7 +204,7 @@ jobs:
           ruby -rrcd_test -S rake test
 
   job_test_multiarch:
-    name: Test
+    name: Test ${{matrix.platform}} on ${{matrix.from_image}}
     needs: docker_build
     strategy:
       fail-fast: false
@@ -156,11 +229,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Download gem from build job
+      - name: Download gem-${{matrix.platform}}
         uses: actions/download-artifact@v2
         with:
           name: gem-${{ matrix.platform }}
-
       - name: Build image and Run tests
         run: |
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

data/Dockerfile.mri.erb

@@ -217,7 +217,7 @@ RUN find /usr/local/rake-compiler/ruby/*mingw*/ -name rbconfig.rb | while read f
 # Raise Windows-API to Vista (affects ruby < 2.6 only)
 RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed -i 's/0x0501/0x0600/' $f ; done
 # Don't link to static libruby
-RUN find /usr/local/rake-compiler/ruby -name *msvcrt-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
+RUN find /usr/local/rake-compiler/ruby -name lib*-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
 <% end %>
 
 USER root

data/History.md

@@ -1,3 +1,9 @@
+1.2.2 / 2022-06-27
+------------------
+
+* Fix ucrt libruby file naming for static build. #69
+
+
 1.2.1 / 2022-03-17
 ------------------
 

data/README.md

@@ -95,51 +95,6 @@ For Linux:
 You can also choose between different executable ruby versions by `rvm use <version>` .
 The current default is 3.1.
 
-
-### As a CI System Container
-
-The OCI images provided by rake-compiler-dock can be used without the `rake-compiler-dock` gem or wrapper. This may be useful if your CI pipeline is building native gems.
-
-For example, a Github Actions job might look like this:
-
-``` yaml
-jobs:
-  native-gem:
-    name: "native-gem"
-    runs-on: ubuntu-latest
-    container:
-      image: "larskanis/rake-compiler-dock-mri-x86_64-linux:1.2.1"
-    steps:
-      - uses: actions/checkout@v2
-      - run: bundle install && bundle exec rake gem:x86_64-linux:rcd
-      - uses: actions/upload-artifact@v2
-        with:
-          name: native-gem
-          path: gems
-          retention-days: 1
-```
-
-Where the referenced rake task might be defined by:
-
-``` ruby
-cross_platforms = ["x64-mingw32", "x86_64-linux", "x86_64-darwin", "arm64-darwin"]
-
-namespace "gem" do
-  cross_platforms.each do |platform|
-    namespace platform do
-      task "rcd" do
-        Rake::Task["native:#{platform}"].invoke
-        Rake::Task["pkg/#{rcee_precompiled_spec.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
-      end
-    end
-  end
-end
-
-```
-
-For an example of rake tasks that support this style of invocation, visit https://github.com/flavorjones/ruby-c-extensions-explained/tree/main/precompiled
-
-
 ### JRuby support
 
 Rake-compiler-dock offers a dedicated docker image for JRuby.
@@ -220,6 +175,48 @@ gem 'rake-compiler-dock', '~> 1.2'
 
 See [the wiki](https://github.com/rake-compiler/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock) for projects which make use of rake-compiler-dock.
 
+### As a CI System Container
+
+The OCI images provided by rake-compiler-dock can be used without the `rake-compiler-dock` gem or wrapper. This may be useful if your CI pipeline is building native gems.
+
+For example, a Github Actions job might look like this:
+
+``` yaml
+jobs:
+  native-gem:
+    name: "native-gem"
+    runs-on: ubuntu-latest
+    container:
+      image: "larskanis/rake-compiler-dock-mri-x86_64-linux:1.2.1"
+    steps:
+      - uses: actions/checkout@v2
+      - run: bundle install && bundle exec rake gem:x86_64-linux:rcd
+      - uses: actions/upload-artifact@v2
+        with:
+          name: native-gem
+          path: gems
+          retention-days: 1
+```
+
+Where the referenced rake task might be defined by:
+
+``` ruby
+cross_platforms = ["x64-mingw32", "x86_64-linux", "x86_64-darwin", "arm64-darwin"]
+
+namespace "gem" do
+  cross_platforms.each do |platform|
+    namespace platform do
+      task "rcd" do
+        Rake::Task["native:#{platform}"].invoke
+        Rake::Task["pkg/#{rcee_precompiled_spec.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
+      end
+    end
+  end
+end
+
+```
+
+For an example of rake tasks that support this style of invocation, visit https://github.com/flavorjones/ruby-c-extensions-explained/tree/main/precompiled
 
 ## Environment Variables
 

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.2.1"
-  IMAGE_VERSION = "1.2.1"
+  VERSION = "1.2.2"
+  IMAGE_VERSION = "1.2.2"
 end

data/test/rcd_test/Rakefile

@@ -41,11 +41,12 @@ namespace "gem" do
 
       desc "Build the native gem for #{plat}"
       task plat => 'prepare' do
+        config = "-- #{ENV['RCD_TEST_CONFIG']}"
         # Set mountdir of the directory where .git resides, so that git ls-files in the gemspec works
         RakeCompilerDock.sh <<-EOT, platform: plat, mountdir: Dir.pwd + "/../.."
           (cp tmp/gem/gem-*.pem ~/.gem/ || true) &&
           bundle --local &&
-          rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem
+          rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem #{config}
         EOT
       end
     end

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

@@ -19,5 +19,11 @@ else
   have_func('rb_thread_call_without_gvl', 'ruby/thread.h') ||
       raise("rb_thread_call_without_gvl() not found")
 
+  if arg_config("--link-static", false)
+    # https://github.com/rake-compiler/rake-compiler-dock/issues/69
+    puts "Linking with '-static' flag"
+    $LDFLAGS << ' -static'
+  end
+
   create_makefile("rcd_test/rcd_test_ext")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Lars Kanis
@@ -35,7 +35,7 @@ cert_chain:
   oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
   nA==
   -----END CERTIFICATE-----
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler