Skip to content

Commit e1f5d8f

Browse files
RUBY-3551 Add Ruby 3.3 to test matrix (#339)
1 parent bc942e1 commit e1f5d8f

File tree

5 files changed

+42
-53
lines changed

5 files changed

+42
-53
lines changed

.evergreen/config.yml

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ timeout:
2929
script: |
3030
ls -la
3131
32-
3332
# -----------------------------------------------
3433
# .evergreen/config/functions.yml.erb
3534
# -----------------------------------------------
@@ -241,7 +240,6 @@ tasks:
241240
commands:
242241
- func: "run tests"
243242

244-
245243
# -----------------------------------------------
246244
# .evergreen/config/axes.yml.erb
247245
# -----------------------------------------------
@@ -255,66 +253,58 @@ axes:
255253
run_on: debian11-small
256254
variables:
257255
MACHINE: "debian11"
258-
- id: "ubuntu"
256+
- id: "ubuntu2204"
259257
display_name: "Ubuntu 22.04"
260258
run_on: ubuntu2204-small
261259
variables:
262260
MACHINE: "ubuntu2204"
263-
- id: "rhel"
264-
display_name: "RHEL 8.0"
265-
run_on: rhel80-small
261+
- id: "ubuntu2004"
262+
display_name: "Ubuntu 20.04"
263+
run_on: ubuntu2004-small
266264
variables:
267-
MACHINE: "rhel80"
265+
MACHINE: "ubuntu2004"
268266

269267
- id: "special-os"
270268
display_name: OS
271269
values:
272-
- id: "rhel82-arm64"
273-
display_name: "RHEL 8.2 ARM64"
274-
run_on: rhel82-arm64-small
270+
- id: "ubuntu2204-arm64"
271+
display_name: "Ubuntu 22.04 ARM64"
272+
run_on: ubuntu2204-arm64-small
275273
variables:
276-
MACHINE: rhel82-arm64
274+
MACHINE: ubuntu2204-arm64
277275

278276
- id: ruby
279277
display_name: Ruby Version
280278
values:
281-
279+
- id: ruby-3.3
280+
display_name: ruby-3.3
281+
variables:
282+
RVM_RUBY: ruby-3.3
282283
- id: ruby-3.2
283284
display_name: ruby-3.2
284285
variables:
285286
RVM_RUBY: ruby-3.2
286-
287287
- id: ruby-3.1
288288
display_name: ruby-3.1
289289
variables:
290290
RVM_RUBY: ruby-3.1
291-
292291
- id: ruby-3.0
293292
display_name: ruby-3.0
294293
variables:
295294
RVM_RUBY: ruby-3.0
296-
297295
- id: ruby-2.7
298296
display_name: ruby-2.7
299297
variables:
300298
RVM_RUBY: ruby-2.7
301-
302-
- id: ruby-2.6
303-
display_name: ruby-2.6
304-
variables:
305-
RVM_RUBY: ruby-2.6
306-
307299
- id: jruby-9.4
308300
display_name: jruby-9.4
309301
variables:
310302
RVM_RUBY: jruby-9.4
311-
312303
- id: jruby-9.3
313304
display_name: jruby-9.3
314305
variables:
315306
RVM_RUBY: jruby-9.3
316307

317-
318308
- id: "as"
319309
display_name: ActiveSupport
320310
values:
@@ -347,37 +337,36 @@ axes:
347337
variables:
348338
COMPACT: true
349339

350-
351340
# -----------------------------------------------
352341
# .evergreen/config/variants.yml.erb
353342
# -----------------------------------------------
354343

355344
buildvariants:
356345
- matrix_name: "mri-latest"
357-
matrix_spec: { ruby: ruby-3.2, all-os: '*' }
346+
matrix_spec: { ruby: ruby-3.3, all-os: '*' }
358347
display_name: "${ruby}, ${all-os}"
359348
tasks:
360349
- name: "test"
361350

362351
- matrix_name: "mri-sample"
363-
matrix_spec: { ruby: ["ruby-2.7"], all-os: rhel }
352+
matrix_spec: { ruby: ["ruby-2.7"], all-os: ubuntu2004 }
364353
display_name: "${ruby}, ${all-os}"
365354
tasks:
366355
- name: "test"
367356

368357
- matrix_name: "activesupport-5-6"
369358
matrix_spec:
370-
ruby: ["ruby-3.0", "ruby-2.7", "ruby-2.6"]
371-
all-os: rhel
359+
ruby: ["ruby-3.0", "ruby-2.7"]
360+
all-os: ubuntu2004
372361
as: [ '5.1', '5.2', '6.0', '6.1' ]
373362
display_name: "AS ${as} ${ruby}, ${all-os}"
374363
tasks:
375364
- name: "test"
376365

377366
- matrix_name: "activesupport-7"
378367
matrix_spec:
379-
ruby: ["ruby-3.2", "ruby-2.7"]
380-
all-os: rhel
368+
ruby: ["ruby-3.3", "ruby-2.7"]
369+
all-os: ubuntu2004
381370
as: '7.0'
382371
display_name: "AS ${as} ${ruby}, ${all-os}"
383372
tasks:
@@ -390,15 +379,15 @@ buildvariants:
390379
- name: "test"
391380

392381
- matrix_name: "jruby"
393-
matrix_spec: { ruby: ["jruby-9.4", "jruby-9.3"], all-os: rhel }
382+
matrix_spec: { ruby: ["jruby-9.4", "jruby-9.3"], all-os: ubuntu2204 }
394383
display_name: "${ruby}, ${all-os}"
395384
tasks:
396385
- name: "test"
397386

398387
- matrix_name: "compact"
399388
matrix_spec:
400-
ruby: ["ruby-3.2", "ruby-2.7"]
401-
all-os: rhel
389+
ruby: ["ruby-3.3", "ruby-2.7"]
390+
all-os: ubuntu2004
402391
compact: "on"
403392
display_name: "${ruby} with GC.compact"
404393
tasks:

.evergreen/config/axes.yml.erb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ axes:
77
run_on: debian11-small
88
variables:
99
MACHINE: "debian11"
10-
- id: "ubuntu"
10+
- id: "ubuntu2204"
1111
display_name: "Ubuntu 22.04"
1212
run_on: ubuntu2204-small
1313
variables:
1414
MACHINE: "ubuntu2204"
15-
- id: "rhel"
16-
display_name: "RHEL 8.0"
17-
run_on: rhel80-small
15+
- id: "ubuntu2004"
16+
display_name: "Ubuntu 20.04"
17+
run_on: ubuntu2004-small
1818
variables:
19-
MACHINE: "rhel80"
19+
MACHINE: "ubuntu2004"
2020

2121
- id: "special-os"
2222
display_name: OS
2323
values:
24-
- id: "rhel82-arm64"
25-
display_name: "RHEL 8.2 ARM64"
26-
run_on: rhel82-arm64-small
24+
- id: "ubuntu2204-arm64"
25+
display_name: "Ubuntu 22.04 ARM64"
26+
run_on: ubuntu2204-arm64-small
2727
variables:
28-
MACHINE: rhel82-arm64
28+
MACHINE: ubuntu2204-arm64
2929

3030
- id: ruby
3131
display_name: Ruby Version

.evergreen/config/variants.yml.erb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ buildvariants:
66
- name: "test"
77

88
- matrix_name: "mri-sample"
9-
matrix_spec: { ruby: <%= sample_without_latest %>, all-os: rhel }
9+
matrix_spec: { ruby: <%= sample_without_latest %>, all-os: ubuntu2004 }
1010
display_name: "${ruby}, ${all-os}"
1111
tasks:
1212
- name: "test"
1313

1414
- matrix_name: "activesupport-5-6"
1515
matrix_spec:
1616
ruby: <%= older_rubies %>
17-
all-os: rhel
17+
all-os: ubuntu2004
1818
as: [ '5.1', '5.2', '6.0', '6.1' ]
1919
display_name: "AS ${as} ${ruby}, ${all-os}"
2020
tasks:
@@ -23,7 +23,7 @@ buildvariants:
2323
- matrix_name: "activesupport-7"
2424
matrix_spec:
2525
ruby: <%= sample_mri_rubies %>
26-
all-os: rhel
26+
all-os: ubuntu2004
2727
as: '7.0'
2828
display_name: "AS ${as} ${ruby}, ${all-os}"
2929
tasks:
@@ -36,15 +36,15 @@ buildvariants:
3636
- name: "test"
3737

3838
- matrix_name: "jruby"
39-
matrix_spec: { ruby: <%= jrubies %>, all-os: rhel }
39+
matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2204 }
4040
display_name: "${ruby}, ${all-os}"
4141
tasks:
4242
- name: "test"
4343

4444
- matrix_name: "compact"
4545
matrix_spec:
4646
ruby: <%= sample_mri_rubies %>
47-
all-os: rhel
47+
all-os: ubuntu2004
4848
compact: "on"
4949
display_name: "${ruby} with GC.compact"
5050
tasks:

.evergreen/update-evergreen-configs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ module ConfigProcessor
8181
# the most recently released, stable version of Ruby (make sure this
8282
# version is being built by 10gen/mongo-ruby-toolchain)
8383
def latest_mri_ruby
84-
"ruby-3.2"
84+
"ruby-3.3"
8585
end
8686

8787
# this is a list of the most most recent 3.x and 2.x MRI ruby versions
8888
def sample_mri_rubies
89-
@sample_mri_rubies ||= %w[ ruby-3.2 ruby-2.7 ]
89+
@sample_mri_rubies ||= %w[ ruby-3.3 ruby-2.7 ]
9090
end
9191

9292
# same as `sample_mri_rubies`, but without the `latest_mri_ruby` entry.
@@ -101,7 +101,7 @@ module ConfigProcessor
101101

102102
# older Ruby versions provided by 10gen/mongo-ruby-toolchain
103103
def older_rubies
104-
@older_rubies ||= %w[ ruby-3.0 ruby-2.7 ruby-2.6 ]
104+
@older_rubies ||= %w[ ruby-3.0 ruby-2.7 ]
105105
end
106106

107107
# all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
@@ -112,8 +112,8 @@ module ConfigProcessor
112112
# all supported MRI ruby versions
113113
def supported_mri_rubies
114114
@supported_mri_rubies ||= %w[
115-
ruby-3.2 ruby-3.1 ruby-3.0
116-
ruby-2.7 ruby-2.6
115+
ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0
116+
ruby-2.7
117117
]
118118
end
119119

0 commit comments

Comments
 (0)