From 2e24b9841c30db589831d8978609dc464f872f89 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 10:38:38 +0100 Subject: [PATCH 1/7] Use new toolchain --- .evergreen/run-tests.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index fac2776c2..407cc0645 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -13,7 +13,15 @@ set -o errexit # Exit the script with error if any of the commands fail set_env_vars -set_env_ruby +# Install rbenv and download the requested ruby version +rm -rf ~/.rbenv +git clone https://github.com/rbenv/rbenv.git ~/.rbenv +rm -rf ~/.rbenv/versions/ +curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf - +export PATH="$HOME/.rbenv/bin:$PATH" +eval "$(rbenv init - bash)" +export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1) +rbenv global $FULL_RUBY_VERSION install_deps From 17b2634ced763865009790a3a2760d54f1249d76 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 11:00:14 +0100 Subject: [PATCH 2/7] Use 24.04 for jruby-10 --- .evergreen/config.yml | 2 +- .evergreen/config/variants.yml.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f352e9495..a1fa11580 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -405,7 +405,7 @@ buildvariants: - name: "test" - matrix_name: "jruby" - matrix_spec: { ruby: ["jruby-10.0", "jruby-9.4", "jruby-9.3"], all-os: ubuntu2204 } + matrix_spec: { ruby: ["jruby-10.0", "jruby-9.4", "jruby-9.3"], all-os: ubuntu2404 } display_name: "${ruby}, ${all-os}" tasks: - name: "test" diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb index d4a61541a..02c70930a 100644 --- a/.evergreen/config/variants.yml.erb +++ b/.evergreen/config/variants.yml.erb @@ -38,14 +38,14 @@ buildvariants: tasks: - name: "test" - - matrix_name: "special-os" + - matrix_name: "special-os"x matrix_spec: { ruby: <%= recent_rubies - %w[ jruby-10.0 ] %>, special-os: '*' } display_name: "${ruby}, ${special-os}" tasks: - name: "test" - matrix_name: "jruby" - matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2204 } + matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2404 } display_name: "${ruby}, ${all-os}" tasks: - name: "test" From 3c07069977742b6863eea51d7c05e1cac3a64c60 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 11:10:05 +0100 Subject: [PATCH 3/7] Update arm --- .evergreen/config.yml | 4 ++-- .evergreen/update-evergreen-configs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index a1fa11580..f46726756 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -398,8 +398,8 @@ buildvariants: tasks: - name: "test" - - matrix_name: "special-os" - matrix_spec: { ruby: ["ruby-3.2", "ruby-3.1"], special-os: '*' } + - matrix_name: "special-os"x + matrix_spec: { ruby: ["ruby-3.4", "ruby-3.3"], special-os: '*' } display_name: "${ruby}, ${special-os}" tasks: - name: "test" diff --git a/.evergreen/update-evergreen-configs b/.evergreen/update-evergreen-configs index cddc1e3eb..76966fbad 100755 --- a/.evergreen/update-evergreen-configs +++ b/.evergreen/update-evergreen-configs @@ -75,7 +75,7 @@ module ConfigProcessor # these are used for testing against a few recent ruby versions def recent_rubies - @recent_rubies ||= %w[ ruby-3.2 ruby-3.1 jruby-10.0 ] + @recent_rubies ||= %w[ ruby-3.4 ruby-3.3 jruby-10.0 ] end # the most recently released, stable version of Ruby (make sure this From 8d2cfd8cb72956766c256d629ac4d00d009bc9c9 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 11:17:47 +0100 Subject: [PATCH 4/7] Fix typo --- .evergreen/config.yml | 6 +++++- .evergreen/config/variants.yml.erb | 2 +- .evergreen/update-evergreen-configs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f46726756..f802596c3 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -281,6 +281,10 @@ 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: @@ -398,7 +402,7 @@ buildvariants: tasks: - name: "test" - - matrix_name: "special-os"x + - matrix_name: "special-os" matrix_spec: { ruby: ["ruby-3.4", "ruby-3.3"], special-os: '*' } display_name: "${ruby}, ${special-os}" tasks: diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb index 02c70930a..34356f590 100644 --- a/.evergreen/config/variants.yml.erb +++ b/.evergreen/config/variants.yml.erb @@ -38,7 +38,7 @@ buildvariants: tasks: - name: "test" - - matrix_name: "special-os"x + - matrix_name: "special-os" matrix_spec: { ruby: <%= recent_rubies - %w[ jruby-10.0 ] %>, special-os: '*' } display_name: "${ruby}, ${special-os}" tasks: diff --git a/.evergreen/update-evergreen-configs b/.evergreen/update-evergreen-configs index 76966fbad..fdaeaa0d1 100755 --- a/.evergreen/update-evergreen-configs +++ b/.evergreen/update-evergreen-configs @@ -112,7 +112,7 @@ module ConfigProcessor # all supported MRI ruby versions def supported_mri_rubies @supported_mri_rubies ||= %w[ - ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0 + ruby-3.4 ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0 ruby-2.7 ] end From 38671af57e1588a310d1d0ee2b9c05a1312c43f1 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 12:35:58 +0100 Subject: [PATCH 5/7] Fix java --- .evergreen/run-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 407cc0645..7cf603ea1 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -27,6 +27,7 @@ install_deps # TODO: move this to shared/shlib/set_env.sh export JAVA_HOME="/opt/java/jdk21" +export JAVACMD=$JAVA_HOME/bin/java export SOURCE_VERSION=21 export TARGET_VERSION=21 # END TODO From f281436ff718d98ffd56e8303c4eb4984a452100 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 13:02:08 +0100 Subject: [PATCH 6/7] Fix bundle install --- .evergreen/run-tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 7cf603ea1..88fa6d492 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -23,14 +23,15 @@ eval "$(rbenv init - bash)" export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1) rbenv global $FULL_RUBY_VERSION -install_deps - # TODO: move this to shared/shlib/set_env.sh export JAVA_HOME="/opt/java/jdk21" export JAVACMD=$JAVA_HOME/bin/java export SOURCE_VERSION=21 export TARGET_VERSION=21 # END TODO + +bundle exec rake clean + export CI=1 echo "Running specs" bundle exec rake spec From 60295c610952c5c962acaa7353aec5d06cd193cf Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Thu, 8 Jan 2026 13:09:23 +0100 Subject: [PATCH 7/7] wip --- .evergreen/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 88fa6d492..e11be73fc 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -30,7 +30,7 @@ export SOURCE_VERSION=21 export TARGET_VERSION=21 # END TODO -bundle exec rake clean +install_deps export CI=1 echo "Running specs"