From 74693fa1d81a5ad83fb566d641ceaa68d66940a8 Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Tue, 29 Dec 2020 15:58:14 -0800
Subject: [PATCH] Add ruby 3.0 to build matrix; upgrade rake-compiler-docker
 image to 1.1.0

---
 Rakefile                                                    | 4 ++--
 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-linux/Dockerfile | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index 601c4b7ed80..584210e8f8b 100755
--- a/Rakefile
+++ b/Rakefile
@@ -130,7 +130,7 @@ task 'gem:native' do
         "invoked on macos with ruby #{RUBY_VERSION}. The ruby macos artifact " \
         "build should be running on ruby 2.5."
     end
-    system "rake cross native gem RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
+    system "rake cross native gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
   else
     Rake::Task['dlls'].execute
     ['x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux'].each do |plat|
@@ -138,7 +138,7 @@ task 'gem:native' do
         gem update --system --no-document && \
         bundle && \
         rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem pkg/#{spec.full_name}.gem \
-          RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 \
+          RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 \
           V=#{verbose} \
           GRPC_CONFIG=#{grpc_config}
       EOT
diff --git a/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile b/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile
index 2a949d05995..66637714d84 100644
--- a/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile
+++ b/third_party/rake-compiler-dock/rake_x64-mingw32/Dockerfile
@@ -1,3 +1,3 @@
-FROM larskanis/rake-compiler-dock-mri-x64-mingw32:1.0.0
+FROM larskanis/rake-compiler-dock-mri-x64-mingw32:1.1.0
 
 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 e2ab4cbfdda..50aaae24150 100644
--- a/third_party/rake-compiler-dock/rake_x86-linux/Dockerfile
+++ b/third_party/rake-compiler-dock/rake_x86-linux/Dockerfile
@@ -1 +1 @@
-FROM larskanis/rake-compiler-dock-mri-x86-linux:1.0.0
+FROM larskanis/rake-compiler-dock-mri-x86-linux:1.1.0
diff --git a/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile b/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile
index d78d96702b4..6a2880a9fee 100644
--- a/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile
+++ b/third_party/rake-compiler-dock/rake_x86-mingw32/Dockerfile
@@ -1,3 +1,3 @@
-FROM larskanis/rake-compiler-dock-mri-x86-mingw32:1.0.0
+FROM larskanis/rake-compiler-dock-mri-x86-mingw32:1.1.0
 
 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-linux/Dockerfile b/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile
index 31d2ddb7c31..ede37a24083 100644
--- a/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile
+++ b/third_party/rake-compiler-dock/rake_x86_64-linux/Dockerfile
@@ -1 +1 @@
-FROM larskanis/rake-compiler-dock-mri-x86_64-linux:1.0.0
+FROM larskanis/rake-compiler-dock-mri-x86_64-linux:1.1.0