Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dropped Ruby 2.3 and 2.4 support for CI and releases. #9311

Merged
merged 2 commits into from Dec 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions kokoro/linux/dockerfile/test/ruby/Dockerfile
Expand Up @@ -31,8 +31,6 @@ RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys \
7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN \curl -sSL https://get.rvm.io | 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 @@ -67,7 +67,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-darwin MAKE="$MAKE"
rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE"
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 @@ -117,15 +117,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', 'gem:java']
Expand Down