Skip to content

Commit 2b639a7

Browse files
RUBY-3510 Add Ruby 3.3 to test matrix
1 parent 5d39706 commit 2b639a7

File tree

8 files changed

+76
-59
lines changed

8 files changed

+76
-59
lines changed

Diff for: .evergreen/config.yml

+55-47
Large diffs are not rendered by default.

Diff for: .evergreen/config/axes.yml.erb

+8
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@ axes:
150150
- id: "ruby"
151151
display_name: Ruby Version
152152
values:
153+
- id: "ruby-3.4"
154+
display_name: ruby-3.4
155+
variables:
156+
RVM_RUBY: "ruby-3.4"
157+
- id: "ruby-3.3"
158+
display_name: ruby-3.3
159+
variables:
160+
RVM_RUBY: "ruby-3.3"
153161
- id: "ruby-3.2"
154162
display_name: ruby-3.2
155163
variables:

Diff for: .evergreen/config/standard.yml.erb

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
# latest_ruby = the most recently released, stable version of Ruby
55
# (make sure this version is being built by 10gen/mongo-ruby-toolchain)
6-
latest_ruby = "ruby-3.2".inspect # so it gets quoted as a string
6+
latest_ruby = "ruby-3.3".inspect # so it gets quoted as a string
77

88
# these are used for testing against a few recent ruby versions
9-
recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.4 )
9+
recent_rubies = %w( ruby-3.3 ruby-3.2 jruby-9.4 )
1010

1111
# this is a list of the most most recent 3.x and 2.x MRI ruby versions
12-
sample_mri_rubies = %w( ruby-3.2 ruby-2.7 )
12+
sample_mri_rubies = %w( ruby-3.3 ruby-2.7 )
1313

1414
# as above, but including the most recent JRuby release
1515
sample_rubies = sample_mri_rubies + %w( jruby-9.4 )
@@ -20,9 +20,9 @@
2020
# all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
2121
jrubies = %w( jruby-9.4 jruby-9.3 )
2222

23-
supported_mri_rubies_3 = %w( ruby-3.2 ruby-3.1 ruby-3.0 )
23+
supported_mri_rubies_3 = %w( ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0 )
2424

25-
supported_mri_rubies_3_ubuntu = %w( ruby-3.2 ruby-3.1 )
25+
supported_mri_rubies_3_ubuntu = %w( ruby-3.3 ruby-3.2 ruby-3.1 )
2626

2727
supported_mri_ruby_2 = "ruby-2.7".inspect
2828

@@ -542,7 +542,7 @@ buildvariants:
542542

543543
- matrix_name: "aws-lambda"
544544
matrix_spec:
545-
ruby: <%= latest_ruby %>
545+
ruby: 'ruby-3.2'
546546
os: ubuntu2204
547547
display_name: "AWS Lambda"
548548
tasks:

Diff for: mongo.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ Gem::Specification.new do |s|
3838

3939
s.required_ruby_version = ">= 2.5"
4040

41+
s.add_dependency 'base64'
4142
s.add_dependency 'bson', '>=4.14.1', '<6.0.0'
4243
end

Diff for: spec/integration/client_side_encryption/custom_endpoint_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
end
124124

125125
let(:error_regex) do
126-
/SocketError: getaddrinfo:/
126+
/(SocketError|ResolutionError): getaddrinfo:/
127127
end
128128

129129
it_behaves_like 'raising a KMS error'

Diff for: spec/integration/retryable_writes_errors_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
end
9494

9595
context "PoolClearedError retryability test" do
96-
require_topology :single, :replica_set, :sharded
96+
require_topology :single, :sharded
9797
require_no_multi_mongos
9898
require_fail_command
9999
require_retry_writes
@@ -162,8 +162,8 @@
162162
# be rescanned and the pool to be unpaused, allowing the second checkout
163163
# to succeed (when it should fail). Therefore we want the second insert's
164164
# check out to win the race. This gives the check out a little head start.
165-
allow_any_instance_of(Mongo::Server::ConnectionPool).to receive(:ready).and_wrap_original do |m, *args, &block|
166-
::Utils.wait_for_condition(5) do
165+
allow(collection.cluster.next_primary.pool).to receive(:ready).and_wrap_original do |m, *args, &block|
166+
::Utils.wait_for_condition(3) do
167167
# check_out_results should contain:
168168
# - insert1 connection check out successful
169169
# - pool cleared

Diff for: spec/mongo/client_encryption_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
it 'raises an exception' do
290290
expect do
291291
data_key_id
292-
end.to raise_error(Mongo::Error::KmsError, /SocketError/)
292+
end.to raise_error(Mongo::Error::KmsError, /SocketError|ResolutionError/)
293293
end
294294
end
295295

0 commit comments

Comments
 (0)