Remove support for ruby 2.5.

This includes deleting all of the associated tests. PiperOrigin-RevId: 498228866
protocolbuffers · Dec 28, 2022 · 4958971 · 4958971
1 parent 0ca97a1
commit 4958971
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 77 deletions.
diff --git a/kokoro/linux/ruby25/common.cfg b/kokoro/linux/ruby25/common.cfg
diff --git a/kokoro/linux/ruby25/continuous.cfg b/kokoro/linux/ruby25/continuous.cfg
diff --git a/kokoro/linux/ruby25/presubmit.cfg b/kokoro/linux/ruby25/presubmit.cfg
diff --git a/kokoro/macos/ruby25/build.sh b/kokoro/macos/ruby25/build.sh
diff --git a/kokoro/macos/ruby25/common.cfg b/kokoro/macos/ruby25/common.cfg
diff --git a/kokoro/macos/ruby25/continuous.cfg b/kokoro/macos/ruby25/continuous.cfg
diff --git a/kokoro/macos/ruby25/presubmit.cfg b/kokoro/macos/ruby25/presubmit.cfg
diff --git a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
@@ -14,8 +14,8 @@ sudo chown -R $(whoami) /Library/Ruby/
 
 source $HOME/.rvm/scripts/rvm
 set -e  # rvm commands are very verbose
-time rvm install 2.5.0
-rvm use 2.5.0
+time rvm install 2.6.0
+rvm use 2.6.0
 gem install rake-compiler --no-document
 gem install bundler --no-document
 time rvm install 3.1.0
@@ -106,10 +106,10 @@ for v in 3.0.0 2.7.0 ; do
   # rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE"
 done
 set +x
-rvm use 2.5.0
+rvm use 2.6.0
 set -x
-ruby --version | grep 'ruby 2.5.0'
-for v in 2.6.0 2.5.1; do
+ruby --version | grep 'ruby 2.6.0'
+for v in 2.6.0 ; do
   ccache -c
   rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE"
   # Disabled until it can be fixed: https://github.com/protocolbuffers/protobuf/issues/9804

diff --git a/ruby/Rakefile b/ruby/Rakefile
@@ -133,15 +133,15 @@ else
     ['x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt', '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.1.0:3.0.0:2.7.0:2.6.0:2.5.0
+        IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0
       EOT
     end
   end
 
   if RUBY_PLATFORM =~ /darwin/
     task 'gem:native' do
       system "rake genproto"
-      system "rake cross native gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0:2.5.1"
+      system "rake cross native gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0"
     end
   else
     task 'gem:native' => [:genproto, 'gem:windows', 'gem:java']