Skip to content

Commit f6f3b14

Browse files
Use new toolchain (#367)
1 parent f0387e3 commit f6f3b14

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ axes:
281281
- id: ruby
282282
display_name: Ruby Version
283283
values:
284+
- id: ruby-3.4
285+
display_name: ruby-3.4
286+
variables:
287+
RVM_RUBY: ruby-3.4
284288
- id: ruby-3.3
285289
display_name: ruby-3.3
286290
variables:
@@ -399,13 +403,13 @@ buildvariants:
399403
- name: "test"
400404

401405
- matrix_name: "special-os"
402-
matrix_spec: { ruby: ["ruby-3.2", "ruby-3.1"], special-os: '*' }
406+
matrix_spec: { ruby: ["ruby-3.4", "ruby-3.3"], special-os: '*' }
403407
display_name: "${ruby}, ${special-os}"
404408
tasks:
405409
- name: "test"
406410

407411
- matrix_name: "jruby"
408-
matrix_spec: { ruby: ["jruby-10.0", "jruby-9.4", "jruby-9.3"], all-os: ubuntu2204 }
412+
matrix_spec: { ruby: ["jruby-10.0", "jruby-9.4", "jruby-9.3"], all-os: ubuntu2404 }
409413
display_name: "${ruby}, ${all-os}"
410414
tasks:
411415
- name: "test"

.evergreen/config/variants.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ buildvariants:
4545
- name: "test"
4646

4747
- matrix_name: "jruby"
48-
matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2204 }
48+
matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2404 }
4949
display_name: "${ruby}, ${all-os}"
5050
tasks:
5151
- name: "test"

.evergreen/run-tests.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,25 @@ set -o errexit # Exit the script with error if any of the commands fail
1313

1414
set_env_vars
1515

16-
set_env_ruby
17-
18-
install_deps
16+
# Install rbenv and download the requested ruby version
17+
rm -rf ~/.rbenv
18+
git clone https://github.com/rbenv/rbenv.git ~/.rbenv
19+
rm -rf ~/.rbenv/versions/
20+
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 -
21+
export PATH="$HOME/.rbenv/bin:$PATH"
22+
eval "$(rbenv init - bash)"
23+
export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
24+
rbenv global $FULL_RUBY_VERSION
1925

2026
# TODO: move this to shared/shlib/set_env.sh
2127
export JAVA_HOME="/opt/java/jdk21"
28+
export JAVACMD=$JAVA_HOME/bin/java
2229
export SOURCE_VERSION=21
2330
export TARGET_VERSION=21
2431
# END TODO
32+
33+
install_deps
34+
2535
export CI=1
2636
echo "Running specs"
2737
bundle exec rake spec

.evergreen/update-evergreen-configs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module ConfigProcessor
7575

7676
# these are used for testing against a few recent ruby versions
7777
def recent_rubies
78-
@recent_rubies ||= %w[ ruby-3.2 ruby-3.1 jruby-10.0 ]
78+
@recent_rubies ||= %w[ ruby-3.4 ruby-3.3 jruby-10.0 ]
7979
end
8080

8181
# the most recently released, stable version of Ruby (make sure this
@@ -112,7 +112,7 @@ module ConfigProcessor
112112
# all supported MRI ruby versions
113113
def supported_mri_rubies
114114
@supported_mri_rubies ||= %w[
115-
ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0
115+
ruby-3.4 ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0
116116
ruby-2.7
117117
]
118118
end

0 commit comments

Comments
 (0)