rake-compiler-dock 1.9.1 → 1.11.0.rc1

data/test/test_environment_variables.rb

@@ -85,6 +85,19 @@ class TestEnvironmentVariables
     end
   end
 
+  class UsingWrapperSpecifyingRuby < UsingWrapper
+    include Common
+
+    def invocation(command)
+      idir = File.join(File.dirname(__FILE__), '../lib')
+      "RCD_RUBY_VERSION=3.1.6 RCD_PLATFORM=#{TEST_PLATFORM} RCD_RUBYVM=#{IS_JRUBY ? 'jruby' : 'mri'} #{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
+    end
+
+    def test_RUBY_VERSION
+      assert_equal "3.1.6", rcd_env['RBENV_VERSION']
+    end
+  end
+
   class AsIfContinuousIntegration < Test::Unit::TestCase
     include Common
 

data/test/test_mig.rb

@@ -0,0 +1,18 @@
+require 'rake_compiler_dock'
+require 'test/unit'
+
+class TestMigCompile < Test::Unit::TestCase
+  TEST_PLATFORM = ENV["TEST_PLATFORM"] || 'arm64-darwin'
+
+  def test_mig_compile
+    omit "only on darwin platform" unless TEST_PLATFORM =~ /darwin/
+
+    RakeCompilerDock::Starter.sh "mig -header tmp/mig_test_rpc.h -user tmp/mig_test_rpc.c -sheader /dev/null -server /dev/null -I. test/fixtures/mig_test_rpc.defs ", platform: TEST_PLATFORM, verbose: false
+
+    h_file = File.read("tmp/mig_test_rpc.h")
+    assert_match /Request_mig_test_call/, h_file
+
+    c_file = File.read("tmp/mig_test_rpc.c")
+    assert_match /Reply__mig_test_call/, c_file
+  end
+end

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_starter.rb

@@ -38,6 +38,12 @@ class TestStarter < Test::Unit::TestCase
     with_env({"RAKE_COMPILER_DOCK_IMAGE" => "env-var-value"}) do
       assert_equal("env-var-value", Starter.container_image_name)
     end
+    with_env({"CONTAINER_REGISTRY" => "env-var-value"}) do
+      assert_match(/env-var-value\//, Starter.container_image_name(platform: "x64-mingw-ucrt"))
+    end
+    with_env({"RCD_IMAGE_VERSION" => "env-var-value"}) do
+      assert_match(/:env-var-value-/, Starter.container_image_name(platform: "x64-mingw-ucrt"))
+    end
 
     # with image option
     assert_equal("option-value", Starter.container_image_name({:image => "option-value"}))

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,13 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Lars Kanis
 bindir: bin
-cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDEyMjkxOTU2NTZaFw0yNTEy
+  MjkxOTU2NTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
+  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
+  7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAoZZWzNV2XXaoSmvyamSSN+Wt/Ia+DNrU
+  2pc3kMEqykH6l1WiVPszr6HavQ//2I2UcSRSS5AGDdiSXcfyFmHtMBdtJHhTPcn7
+  4DLliB0szpvwG+ltGD8PI8eWkLaTQeFzs+0QCTavgKV+Zw56Q0J5zZvHHUMrLkUD
+  qhwKjdTdkrRTn9Sqi0BrIRRZGTUDdrt8qoWm35aES5arKZzytgrRD/kXfFW2LCg0
+  FzgTKibR4/3g8ph94kQLg/D2SMlVPkQ3ECi036mZxDC2n8V6u3rDkG5923wmrRZB
+  J6cqz475Q8HYORQCB68OPzkWMfC7mBo3vpSsIqRoNs1FE4FJu4FGwZG8fBSrDC4H
+  bZe+GtyS3e2SMjgT65zp35gLO9I7MquzYN9P6V2u1iBpTycchk5z9R1ghxzZSBT8
+  DrkJ9tVlPQtJB0LqT0tvBap4upnwT1xYq721b5dwH6AF4Pi6iz/dc5vnq1/MH8bV
+  8VbbBzzeE7MsvgkP3sHlLmY8PtuyViJ8
+  -----END CERTIFICATE-----
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,25 +95,28 @@ 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
 - CONTRIBUTING.md
 - Dockerfile.jruby
 - Dockerfile.mri.erb
 - Gemfile
-- History.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/rake-compiler-dock
+- build/buildkitd.toml
 - build/gem_helper.rb
 - build/mk_i686.rb
 - build/mk_musl_cross.sh
 - 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
@@ -108,8 +136,8 @@ files:
 - mingw64-ucrt/mingw-w64-enable-ucrt.patch
 - rake-compiler-dock.gemspec
 - test/env/Dockerfile.alpine
-- test/env/Dockerfile.centos
 - test/env/Dockerfile.debian
+- test/fixtures/mig_test_rpc.defs
 - test/rcd_test/Gemfile
 - test/rcd_test/Rakefile
 - test/rcd_test/ext/java/RcdTestExtService.java
@@ -121,6 +149,7 @@ files:
 - test/rcd_test/rcd_test.gemspec
 - test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
+- test/test_mig.rb
 - test/test_parallel_docker_build.rb
 - test/test_starter.rb
 - test/test_versions.rb
@@ -142,14 +171,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.
 test_files:
 - test/env/Dockerfile.alpine
-- test/env/Dockerfile.centos
 - test/env/Dockerfile.debian
+- test/fixtures/mig_test_rpc.defs
 - test/rcd_test/Gemfile
 - test/rcd_test/Rakefile
 - test/rcd_test/ext/java/RcdTestExtService.java
@@ -161,6 +190,7 @@ test_files:
 - test/rcd_test/rcd_test.gemspec
 - test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
+- test/test_mig.rb
 - test/test_parallel_docker_build.rb
 - test/test_starter.rb
 - test/test_versions.rb

data/test/env/Dockerfile.centos

@@ -1,24 +0,0 @@
-ARG from_image
-FROM ${from_image}
-
-RUN uname -a
-
-# Change download address of Centos-8 which is EOL
-RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
-
-RUN yum install -y ruby git
-
-RUN ruby --version
-RUN gem env
-
-# centos-8 comes with Ruby 2.5, and this is the last version of bundler that supports it
-RUN gem install bundler -v2.2.28
-
-WORKDIR /build
-
-CMD ruby -e "puts Gem::Platform.local.to_s" && \
-  gem install --local *.gem --verbose --no-document && \
-  cd test/rcd_test/ && \
-  bundle install && \
-  rake test