From bb740d015ba1475f5e4442ae6e0f7e0a9abaa023 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Wed, 21 May 2025 11:57:12 +0200 Subject: [PATCH 1/4] Bump lmc version --- gemfiles/standard.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/standard.rb b/gemfiles/standard.rb index 0b01687a84..7ab5e63a3a 100644 --- a/gemfiles/standard.rb +++ b/gemfiles/standard.rb @@ -64,6 +64,6 @@ def standard_dependencies gem 'ruby-lsp', platforms: :mri end - gem 'libmongocrypt-helper', '~> 1.12.0' if ENV['FLE'] == 'helper' + gem 'libmongocrypt-helper', '~> 1.14.0' if ENV['FLE'] == 'helper' end # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength From e5a461561eb000de265e9cda49976a42ea3a6021 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Wed, 21 May 2025 13:04:40 +0200 Subject: [PATCH 2/4] Pin async to a working version --- gemfiles/standard.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gemfiles/standard.rb b/gemfiles/standard.rb index 7ab5e63a3a..82d7ce6f45 100644 --- a/gemfiles/standard.rb +++ b/gemfiles/standard.rb @@ -45,6 +45,9 @@ def standard_dependencies group :testing do gem 'timecop' gem 'ice_nine' + if RUBY_VERSION =~ /^3\.1/ + gem 'async', '2.23.1', platforms: :mri + end gem 'rubydns', platforms: :mri gem 'rspec-retry' gem 'rfc', '~> 0.2.0' From 02908d7b1beec86dd686e39d7b4714f753041fe8 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Wed, 21 May 2025 14:24:35 +0200 Subject: [PATCH 3/4] wip --- spec/integration/sdam_error_handling_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/integration/sdam_error_handling_spec.rb b/spec/integration/sdam_error_handling_spec.rb index c93ea31ae7..b984a338e5 100644 --- a/spec/integration/sdam_error_handling_spec.rb +++ b/spec/integration/sdam_error_handling_spec.rb @@ -5,6 +5,7 @@ describe 'SDAM error handling' do require_topology :single, :replica_set, :sharded + require_mri clean_slate From 2fc632c2296c43539615a6b620e68f5f980ef38b Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Wed, 21 May 2025 15:24:05 +0200 Subject: [PATCH 4/4] Make rubocop happy --- gemfiles/standard.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gemfiles/standard.rb b/gemfiles/standard.rb index 82d7ce6f45..c8065b3a1b 100644 --- a/gemfiles/standard.rb +++ b/gemfiles/standard.rb @@ -45,9 +45,7 @@ def standard_dependencies group :testing do gem 'timecop' gem 'ice_nine' - if RUBY_VERSION =~ /^3\.1/ - gem 'async', '2.23.1', platforms: :mri - end + gem 'async', '2.23.1', platforms: :mri if RUBY_VERSION.match?(/^3\.1/) gem 'rubydns', platforms: :mri gem 'rspec-retry' gem 'rfc', '~> 0.2.0'