Skip to content

Commit 5de7c80

Browse files
Drop Ruby 3.0
Bump to Bundler v2.6.6 now that the minimum supported Ruby version is 3.1. PiperOrigin-RevId: 738125541
1 parent 4e98196 commit 5de7c80

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

.github/workflows/test_ruby.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ jobs:
3030
include:
3131
# Test both FFI and Native implementations on the highest and lowest
3232
# Ruby versions for CRuby and JRuby
33-
- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: NATIVE, image: 'us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:7.1.2-ruby-3.0.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82' }
34-
- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: FFI, continuous-only: true, image: 'us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:7.1.2-ruby-3.0.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82' }
35-
- { name: Ruby 3.1, ruby: ruby-3.1.6, continuous-only: true }
33+
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: NATIVE }
34+
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: FFI }
3635
- { name: Ruby 3.2, ruby: ruby-3.2.6, continuous-only: true }
3736
- { name: Ruby 3.3, ruby: ruby-3.3.6, continuous-only: true }
3837
- { name: Ruby 3.4, ruby: ruby-3.4.1, ffi: NATIVE }
@@ -85,11 +84,11 @@ jobs:
8584
- name: Run tests
8685
uses: protocolbuffers/protobuf-ci/docker@v4
8786
with:
88-
image: i386/ruby:3.0.2-buster
87+
image: i386/ruby:3.1.6-bullseye
8988
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
9089
command: >-
9190
/bin/bash -cex '
92-
gem install bundler -v 2.5.13;
91+
gem install bundler -v 2.6.6;
9392
cd /workspace/ruby;
9493
bundle;
9594
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake;
@@ -117,11 +116,11 @@ jobs:
117116
# - name: Run tests
118117
# uses: protocolbuffers/protobuf-ci/docker@v4
119118
# with:
120-
# image: arm64v8/ruby:3.0.2-buster
119+
# image: arm64v8/ruby:3.1.6-bullseye
121120
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
122121
# command: >-
123122
# /bin/bash -cex '
124-
# gem install bundler -v 2.5.13;
123+
# gem install bundler -v 2.6.6;
125124
# cd /workspace/ruby;
126125
# bundle;
127126
# PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake;
@@ -136,9 +135,8 @@ jobs:
136135
# Test both FFI and Native implementations on the highest and lowest
137136
# Ruby versions for CRuby.
138137
# Quote versions numbers otherwise 3.0 will render as 3
139-
- { version: "3.0", ffi: NATIVE }
140-
- { version: "3.0", ffi: FFI, continuous-only: true }
141-
- { version: "3.1", continuous-only: true }
138+
- { version: "3.1", ffi: NATIVE }
139+
- { version: "3.1", ffi: FFI }
142140
- { version: "3.2", continuous-only: true }
143141
- { version: "3.3", continuous-only: true }
144142
- { version: "3.4", ffi: NATIVE }
@@ -180,9 +178,8 @@ jobs:
180178
include:
181179
# Test both FFI and Native implementations on the highest and lowest
182180
# Ruby versions for CRuby and JRuby.
183-
- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: NATIVE, image: 'us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:7.1.2-ruby-3.0.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82', continuous-only: true}
184-
- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: FFI, image: 'us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:7.1.2-ruby-3.0.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82', continuous-only: true}
185-
- { name: Ruby 3.1, ruby: ruby-3.1.6, continuous-only: true}
181+
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: NATIVE }
182+
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: FFI }
186183
- { name: Ruby 3.2, ruby: ruby-3.2.6, continuous-only: true}
187184
- { name: Ruby 3.3, ruby: ruby-3.3.6, continuous-only: true}
188185
- { name: Ruby 3.4, ruby: ruby-3.4.1, ffi: NATIVE }

ruby/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ DEPENDENCIES
4141
test-unit (~> 3.0, >= 3.0.9)
4242

4343
BUNDLED WITH
44-
2.5.23
44+
2.6.6

ruby/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ else
155155
if RUBY_PLATFORM =~ /darwin/
156156
task 'gem:native' do
157157
system "rake genproto"
158-
system "rake cross native gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0"
158+
system "rake cross native gem RUBY_CC_VERSION=3.1.0"
159159
end
160160
else
161161
task 'gem:native' => [:genproto, 'gem:windows', 'gem:java']

ruby/google-protobuf.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
3030
ext/google/protobuf_c/Rakefile
3131
]
3232
end
33-
s.required_ruby_version = '>= 3.0'
33+
s.required_ruby_version = '>= 3.1'
3434
# bigdecimal must be used as a non-built in gem as of ruby-3.4
3535
s.add_dependency "bigdecimal"
3636
# TODO: evaluate removing Rakefile and moving logic to extconf.rb, so that we

0 commit comments

Comments
 (0)