From 6e2989fa5b7d51edf3fe3c2dcd68227157442193 Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Mon, 13 Jan 2025 10:37:27 +0800 Subject: [PATCH] [ruby] Update rake-compiler-dock to 1.8.0 Also updates target CC versions to match per https://github.com/rake-compiler/rake-compiler-dock/releases/tag/v1.8.0 Signed-off-by: Chad Wilson --- Rakefile | 2 +- grpc.gemspec | 2 +- templates/grpc.gemspec.template | 2 +- third_party/rake-compiler-dock/rake_aarch64-linux/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_arm64-darwin/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_x64-mingw-ucrt/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_x86-linux/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_x86_64-darwin/Dockerfile | 2 +- third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Rakefile b/Rakefile index 706f71f73adf2..4d7ce6d6ac089 100755 --- a/Rakefile +++ b/Rakefile @@ -143,7 +143,7 @@ task 'gem:native', [:plat] do |t, args| verbose = ENV['V'] || '0' grpc_config = ENV['GRPC_CONFIG'] || 'opt' - ruby_cc_versions = ['3.4.1', '3.3.5', '3.2.0', '3.1.0', '3.0.0'].join(':') + ruby_cc_versions = ['3.4.1', '3.3.5', '3.2.6', '3.1.6', '3.0.7'].join(':') selected_plat = "#{args[:plat]}" # use env variable to set artifact build paralellism diff --git a/grpc.gemspec b/grpc.gemspec index fe7163c47de82..7aea3e00a1f71 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'simplecov', '~> 0.22' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rake-compiler', '~> 1.2.1' - s.add_development_dependency 'rake-compiler-dock', '~> 1.7' + s.add_development_dependency 'rake-compiler-dock', '~> 1.8' s.add_development_dependency 'rspec', '~> 3.6' s.add_development_dependency 'rubocop', '~> 1.41.0' s.add_development_dependency 'signet', '~> 0.7' diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index 512e1d19771a6..fe4792cdb3b54 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -44,7 +44,7 @@ s.add_development_dependency 'simplecov', '~> 0.22' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rake-compiler', '~> 1.2.1' - s.add_development_dependency 'rake-compiler-dock', '~> 1.7' + s.add_development_dependency 'rake-compiler-dock', '~> 1.8' s.add_development_dependency 'rspec', '~> 3.6' s.add_development_dependency 'rubocop', '~> 1.41.0' s.add_development_dependency 'signet', '~> 0.7' diff --git a/third_party/rake-compiler-dock/rake_aarch64-linux/Dockerfile b/third_party/rake-compiler-dock/rake_aarch64-linux/Dockerfile index 6fa822be898a8..b8cb762577a58 100644 --- a/third_party/rake-compiler-dock/rake_aarch64-linux/Dockerfile +++ b/third_party/rake-compiler-dock/rake_aarch64-linux/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-aarch64-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-aarch64-linux #================= # Install ccache diff --git a/third_party/rake-compiler-dock/rake_arm64-darwin/Dockerfile b/third_party/rake-compiler-dock/rake_arm64-darwin/Dockerfile index 41207bc2d8948..2f31ea626da84 100644 --- a/third_party/rake-compiler-dock/rake_arm64-darwin/Dockerfile +++ b/third_party/rake-compiler-dock/rake_arm64-darwin/Dockerfile @@ -1 +1 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-arm64-darwin +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-arm64-darwin diff --git a/third_party/rake-compiler-dock/rake_x64-mingw-ucrt/Dockerfile b/third_party/rake-compiler-dock/rake_x64-mingw-ucrt/Dockerfile index 5073c875a3ffc..9a9048c776f4c 100644 --- a/third_party/rake-compiler-dock/rake_x64-mingw-ucrt/Dockerfile +++ b/third_party/rake-compiler-dock/rake_x64-mingw-ucrt/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-x64-mingw-ucrt +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-x64-mingw-ucrt RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done diff --git a/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile b/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile index ccdaabea99c41..0584aa9681405 100644 --- a/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile +++ b/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-x64-mingw32 +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-x64-mingw32 RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done diff --git a/third_party/rake-compiler-dock/rake_x86-linux/Dockerfile b/third_party/rake-compiler-dock/rake_x86-linux/Dockerfile index 91f13a4f6637d..47e95d794f9e7 100644 --- a/third_party/rake-compiler-dock/rake_x86-linux/Dockerfile +++ b/third_party/rake-compiler-dock/rake_x86-linux/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-x86-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-x86-linux #================= # Install ccache diff --git a/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile b/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile index 0553a386e2cd0..edb745fefbd84 100644 --- a/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile +++ b/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-x86-mingw32 +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-x86-mingw32 RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done diff --git a/third_party/rake-compiler-dock/rake_x86_64-darwin/Dockerfile b/third_party/rake-compiler-dock/rake_x86_64-darwin/Dockerfile index d54718b363307..17312dbfd140d 100644 --- a/third_party/rake-compiler-dock/rake_x86_64-darwin/Dockerfile +++ b/third_party/rake-compiler-dock/rake_x86_64-darwin/Dockerfile @@ -1 +1 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-x86_64-darwin +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-x86_64-darwin diff --git a/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile b/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile index 354dff4747006..31e7085629bed 100644 --- a/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile +++ b/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.1-mri-x86_64-linux +FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.8.0-mri-x86_64-linux #================= # Install ccache