From f558d963e322753a8eb014eb480a80be306e10ab Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Mon, 8 Apr 2024 20:23:41 +0200 Subject: [PATCH] Update to rake-compiler-dock-1.5.0.rc1 and ruby-3.3 --- .github/workflows/binary-gems.yml | 4 ++-- Gemfile | 2 +- Rakefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/binary-gems.yml b/.github/workflows/binary-gems.yml index 76ade577a..4215d489f 100644 --- a/.github/workflows/binary-gems.yml +++ b/.github/workflows/binary-gems.yml @@ -18,7 +18,7 @@ jobs: - platform: "x64-mingw-ucrt" - platform: "x64-mingw32" - platform: "x86-mingw32" - - platform: "x86_64-linux" + - platform: "x86_64-linux-gnu" steps: - uses: actions/checkout@v3 - name: Set up Ruby @@ -64,7 +64,7 @@ jobs: PGVERSION: 10.20-1-windows - os: ubuntu-latest ruby: "3.2" - platform: "x86_64-linux" + platform: "x86_64-linux-gnu" runs-on: ${{ matrix.os }} env: diff --git a/Gemfile b/Gemfile index 6c6212849..d5d30256b 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org/" group :development, :test do gem "bundler", ">= 1.16", "< 3.0" gem "rake-compiler", "~> 1.0" - gem "rake-compiler-dock", "~> 1.0" + gem "rake-compiler-dock", "~> 1.5.pre" gem "rdoc", "~> 6.4" gem "rspec", "~> 3.5" gem "mini_portile2", "~> 2.1" diff --git a/Rakefile b/Rakefile index 1a876f1a0..69d6b855f 100644 --- a/Rakefile +++ b/Rakefile @@ -47,7 +47,7 @@ CrossLibraries = [ ['x64-mingw-ucrt', 'mingw64', 'x86_64-w64-mingw32'], ['x86-mingw32', 'mingw', 'i686-w64-mingw32'], ['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'], - ['x86_64-linux', 'linux-x86_64', 'x86_64-redhat-linux'], + ['x86_64-linux-gnu', 'linux-x86_64', 'x86_64-redhat-linux-gnu'], ].map do |platform, openssl_config, toolchain| CrossLibrary.new platform, openssl_config, toolchain end @@ -103,7 +103,7 @@ CrossLibraries.each do |xlib| #{ "sudo yum install -y perl-IPC-Cmd &&" if platform =~ /linux/ } (cp build/gem/gem-*.pem ~/.gem/ || true) && bundle install --local && - rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0 + rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0 EOT end desc "Build the native binary gems"