From b94f09aaf4560a00dc6e446d61a7eac501d052f8 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 19 Jan 2021 17:25:47 -0800 Subject: [PATCH 1/4] Drop support for ruby 2.3 --- Rakefile | 2 +- grpc.gemspec | 2 +- tools/run_tests/artifacts/distribtest_targets.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index c4cb31438b0..faae2106764 100755 --- a/Rakefile +++ b/Rakefile @@ -121,7 +121,7 @@ task 'gem:native' do verbose = ENV['V'] || '0' grpc_config = ENV['GRPC_CONFIG'] || 'opt' - ruby_cc_versions = ['3.0.0', '2.7.0', '2.6.0', '2.5.0', '2.4.0', '2.3.0'].join(':') + ruby_cc_versions = ['3.0.0', '2.7.0', '2.6.0', '2.5.0', '2.4.0'].join(':') if RUBY_PLATFORM =~ /darwin/ FileUtils.touch 'grpc_c.32.ruby' diff --git a/grpc.gemspec b/grpc.gemspec index a045dcab671..922d91ce5f2 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.description = 'Send RPCs from Ruby using GRPC' s.license = 'Apache-2.0' - s.required_ruby_version = '>= 2.3.0' + s.required_ruby_version = '>= 2.4.0' s.files = %w( Makefile .yardopts ) s.files += %w( etc/roots.pem ) diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 1ffec4a711e..484835ba630 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -361,7 +361,6 @@ def targets(): PythonDistribTest('linux', 'x64', 'ubuntu1604', source=True), PythonDistribTest('linux', 'x64', 'ubuntu1804', source=True), # Ruby - RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_3'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_4'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_5'), RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_6'), @@ -370,7 +369,7 @@ def targets(): RubyDistribTest('linux', 'x64', 'jessie', - ruby_version='ruby_2_3', + ruby_version='ruby_2_4', source=True), RubyDistribTest('linux', 'x64', 'centos7'), RubyDistribTest('linux', 'x64', 'fedora23'), From 0633043a70c072d786d407c55c56d6b28ac02930 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 19 Jan 2021 17:29:36 -0800 Subject: [PATCH 2/4] update dockerfiles --- .../distribtest/ruby_centos7_x64/Dockerfile | 6 +-- .../distribtest/ruby_fedora23_x64/Dockerfile | 6 +-- .../ruby_jessie_x64_ruby_2_3/Dockerfile | 41 ------------------- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_3/Dockerfile diff --git a/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile index fc4eabbbb15..baf5e066cae 100644 --- a/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile @@ -21,11 +21,11 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380 RUN curl -sSL https://get.rvm.io | bash -s stable # Install Ruby 2.3 -RUN /bin/bash -l -c "rvm install ruby-2.3.8" -RUN /bin/bash -l -c "rvm use --default ruby-2.3.8" +RUN /bin/bash -l -c "rvm install ruby-2.4.9" +RUN /bin/bash -l -c "rvm use --default ruby-2.4.9" RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc" +RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.4.9' >> ~/.bashrc" RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" RUN mkdir /var/local/jenkins diff --git a/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile index f586ae377a3..56c564f5886 100644 --- a/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile @@ -27,11 +27,11 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380 RUN curl -sSL https://get.rvm.io | bash -s stable # Install Ruby 2.3 -RUN /bin/bash -l -c "rvm install ruby-2.3.8" -RUN /bin/bash -l -c "rvm use --default ruby-2.3.8" +RUN /bin/bash -l -c "rvm install ruby-2.4.9" +RUN /bin/bash -l -c "rvm use --default ruby-2.4.9" RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc" +RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.4.9' >> ~/.bashrc" RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" RUN mkdir /var/local/jenkins diff --git a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_3/Dockerfile b/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_3/Dockerfile deleted file mode 100644 index 9deff0661b7..00000000000 --- a/tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_3/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:jessie - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - curl \ - gcc && apt-get clean - -#================== -# Ruby dependencies - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB -RUN \curl -sSL https://get.rvm.io | bash -s stable - -# Install Ruby 2.3 -RUN /bin/bash -l -c "rvm install ruby-2.3.8" -RUN /bin/bash -l -c "rvm use --default ruby-2.3.8" -RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" -RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc" -RUN /bin/bash -l -c "gem update --system" -RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document" - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] From 126b9524d713a35afdd7d9801afce118ab7de687 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 19 Jan 2021 23:24:30 -0800 Subject: [PATCH 3/4] update in templates --- templates/grpc.gemspec.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index a5e0801296d..ac543af7a64 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -15,7 +15,7 @@ s.description = 'Send RPCs from Ruby using GRPC' s.license = 'Apache-2.0' - s.required_ruby_version = '>= 2.3.0' + s.required_ruby_version = '>= 2.4.0' s.files = %w( Makefile .yardopts ) s.files += %w( etc/roots.pem ) From ff872f1ca01dc7070e291fd77544f04c10e600be Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 20 Jan 2021 11:57:42 -0800 Subject: [PATCH 4/4] Make centos7 docker image buildable --- tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile index baf5e066cae..b781e92aea0 100644 --- a/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile +++ b/tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile @@ -14,7 +14,7 @@ FROM centos:7 -RUN yum update && yum install -y curl tar which +RUN yum update -y && yum install -y curl tar which # Install rvm RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB