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

RUBY-3510 Add Ruby 3.3 to test matrix #2902

Merged
merged 1 commit into from
Oct 18, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 55 additions & 47 deletions .evergreen/config.yml

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .evergreen/config/axes.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,14 @@ axes:
- id: "ruby"
display_name: Ruby Version
values:
- id: "ruby-3.4"
display_name: ruby-3.4
variables:
RVM_RUBY: "ruby-3.4"
- id: "ruby-3.3"
display_name: ruby-3.3
variables:
RVM_RUBY: "ruby-3.3"
- id: "ruby-3.2"
display_name: ruby-3.2
variables:
Expand Down
12 changes: 6 additions & 6 deletions .evergreen/config/standard.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

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

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

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

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

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

supported_mri_rubies_3_ubuntu = %w( ruby-3.2 ruby-3.1 )
supported_mri_rubies_3_ubuntu = %w( ruby-3.3 ruby-3.2 ruby-3.1 )

supported_mri_ruby_2 = "ruby-2.7".inspect

Expand Down Expand Up @@ -542,7 +542,7 @@ buildvariants:

- matrix_name: "aws-lambda"
matrix_spec:
ruby: <%= latest_ruby %>
ruby: 'ruby-3.2'
os: ubuntu2204
display_name: "AWS Lambda"
tasks:
Expand Down
1 change: 1 addition & 0 deletions mongo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ Gem::Specification.new do |s|

s.required_ruby_version = ">= 2.5"

s.add_dependency 'base64'
s.add_dependency 'bson', '>=4.14.1', '<6.0.0'
end
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
end

let(:error_regex) do
/SocketError: getaddrinfo:/
/(SocketError|ResolutionError): getaddrinfo:/
end

it_behaves_like 'raising a KMS error'
Expand Down
6 changes: 3 additions & 3 deletions spec/integration/retryable_writes_errors_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
end

context "PoolClearedError retryability test" do
require_topology :single, :replica_set, :sharded
require_topology :single, :sharded
require_no_multi_mongos
require_fail_command
require_retry_writes
Expand Down Expand Up @@ -162,8 +162,8 @@
# be rescanned and the pool to be unpaused, allowing the second checkout
# to succeed (when it should fail). Therefore we want the second insert's
# check out to win the race. This gives the check out a little head start.
allow_any_instance_of(Mongo::Server::ConnectionPool).to receive(:ready).and_wrap_original do |m, *args, &block|
::Utils.wait_for_condition(5) do
allow(collection.cluster.next_primary.pool).to receive(:ready).and_wrap_original do |m, *args, &block|
::Utils.wait_for_condition(3) do
# check_out_results should contain:
# - insert1 connection check out successful
# - pool cleared
Expand Down
2 changes: 1 addition & 1 deletion spec/mongo/client_encryption_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
it 'raises an exception' do
expect do
data_key_id
end.to raise_error(Mongo::Error::KmsError, /SocketError/)
end.to raise_error(Mongo::Error::KmsError, /SocketError|ResolutionError/)
end
end

Expand Down
Loading