Skip to content

Commit

Permalink
Cherry-pick fix from #9311 into 3.18.x (#9320)
Browse files Browse the repository at this point in the history
* Dropped Ruby 2.4 support for CI and releases.

* Removed Kokoro configs for old Ruby versions.

* Update Dockerfile to allow it to be rebuilt

Co-authored-by: Joshua Haberman <jhaberman@gmail.com>
  • Loading branch information
acozzette and haberman committed Dec 22, 2021
1 parent 8a0aa4b commit 1fe07f9
Show file tree
Hide file tree
Showing 16 changed files with 5 additions and 133 deletions.
6 changes: 2 additions & 4 deletions kokoro/linux/dockerfile/test/ruby/Dockerfile
Expand Up @@ -23,13 +23,11 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean

# Install rvm
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys \
RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys \
409B6B1796C275462A1703113804BB82D39DC0E3 \
7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN \curl -sSL https://get.rvm.io | bash -s master
RUN \curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s master

RUN /bin/bash -l -c "rvm install 2.3.8"
RUN /bin/bash -l -c "rvm install 2.4.5"
RUN /bin/bash -l -c "rvm install 2.5.1"
RUN /bin/bash -l -c "rvm install 2.6.0"
RUN /bin/bash -l -c "rvm install 2.7.0"
Expand Down
18 changes: 0 additions & 18 deletions kokoro/linux/ruby23/build.sh

This file was deleted.

11 changes: 0 additions & 11 deletions kokoro/linux/ruby23/continuous.cfg

This file was deleted.

11 changes: 0 additions & 11 deletions kokoro/linux/ruby23/presubmit.cfg

This file was deleted.

18 changes: 0 additions & 18 deletions kokoro/linux/ruby24/build.sh

This file was deleted.

11 changes: 0 additions & 11 deletions kokoro/linux/ruby24/continuous.cfg

This file was deleted.

11 changes: 0 additions & 11 deletions kokoro/linux/ruby24/presubmit.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions kokoro/macos/ruby23/build.sh

This file was deleted.

5 changes: 0 additions & 5 deletions kokoro/macos/ruby23/continuous.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions kokoro/macos/ruby23/presubmit.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions kokoro/macos/ruby24/build.sh

This file was deleted.

5 changes: 0 additions & 5 deletions kokoro/macos/ruby24/continuous.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions kokoro/macos/ruby24/presubmit.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
Expand Up @@ -66,7 +66,7 @@ set +x
rvm use 2.5.0
set -x
ruby --version | grep 'ruby 2.5.0'
for v in 2.6.0 2.5.1 2.4.0 2.3.0; do
for v in 2.6.0 2.5.1; do
ccache -c
rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin11 MAKE="$MAKE"
done
Expand Down
2 changes: 0 additions & 2 deletions ruby/Gemfile
@@ -1,5 +1,3 @@
source 'https://rubygems.org'

gemspec

gem "irb", "~> 1.1", "< 1.2.0" if RUBY_VERSION < "2.5"
4 changes: 2 additions & 2 deletions ruby/Rakefile
Expand Up @@ -100,15 +100,15 @@ else
['x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux'].each do |plat|
RakeCompilerDock.sh <<-"EOT", platform: plat
bundle && \
IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0
EOT
end
end

if RUBY_PLATFORM =~ /darwin/
task 'gem:native' do
system "rake genproto"
system "rake cross native gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.1:2.4.0:2.3.0"
system "rake cross native gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.1"
end
else
task 'gem:native' => [:genproto, 'gem:windows']
Expand Down

0 comments on commit 1fe07f9

Please sign in to comment.