Skip to content

Commit 63435f9

Browse files
committed
Add test support for ruby 3.1
1 parent 8faaee3 commit 63435f9

File tree

4 files changed

+28
-56
lines changed

4 files changed

+28
-56
lines changed

.evergreen/config/atlas.yml.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildvariants:
22
- matrix_name: "all"
33
matrix_spec:
4-
ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "jruby-9.2"]
4+
ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.2"]
55
display_name: "Atlas tests ${ruby}"
66
run_on:
77
- ubuntu1804-small
@@ -10,7 +10,7 @@ buildvariants:
1010

1111
- matrix_name: "serverless single mongos"
1212
matrix_spec:
13-
ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "jruby-9.2"]
13+
ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.2"]
1414
single-mongos: single-mongos
1515
display_name: "Atlas serverless ${ruby} single mongos"
1616
run_on:
@@ -20,7 +20,7 @@ buildvariants:
2020

2121
- matrix_name: "serverless multiple mongos"
2222
matrix_spec:
23-
ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "jruby-9.2"]
23+
ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.2"]
2424
display_name: "Atlas serverless tests ${ruby}"
2525
run_on:
2626
- ubuntu1804-small

.evergreen/config/axes.yml.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ axes:
121121
- id: "ruby"
122122
display_name: Ruby Version
123123
values:
124+
- id: "ruby-3.1"
125+
display_name: ruby-3.1
126+
variables:
127+
RVM_RUBY: "ruby-3.1"
124128
- id: "ruby-3.0"
125129
display_name: ruby-3.0
126130
variables:

.evergreen/config/standard.yml.erb

Lines changed: 16 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ buildvariants:
5959
- matrix_name: "mongo-4.4"
6060
matrix_spec:
6161
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
62-
ruby: ["ruby-3.0", "ruby-2.7"]
62+
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
6363
mongodb-version: '4.4'
6464
topology: <%= tt %>
6565
os: ubuntu1604
@@ -161,7 +161,7 @@ buildvariants:
161161
- matrix_name: "fork"
162162
matrix_spec:
163163
fork: on
164-
ruby: ["ruby-3.0", "ruby-2.7"]
164+
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
165165
mongodb-version: ["4.4"]
166166
topology: <%= tt %>
167167
os: ubuntu1604
@@ -172,7 +172,7 @@ buildvariants:
172172
- matrix_name: "solo"
173173
matrix_spec:
174174
solo: on
175-
ruby: [ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2]
175+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2]
176176
mongodb-version: ["4.4"]
177177
topology: <%= tt %>
178178
os: ubuntu1604
@@ -227,19 +227,7 @@ buildvariants:
227227
- matrix_name: "zlib-auth"
228228
matrix_spec:
229229
auth-and-ssl: "auth-and-ssl"
230-
ruby: ["ruby-2.7"]
231-
mongodb-version: "4.4"
232-
topology: "replica-set"
233-
compressor: 'zlib'
234-
os: ubuntu1604
235-
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
236-
tasks:
237-
- name: "test-mlaunch"
238-
239-
- matrix_name: "zlib-auth-3.0"
240-
matrix_spec:
241-
auth-and-ssl: "auth-and-ssl"
242-
ruby: ["ruby-3.0"]
230+
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
243231
mongodb-version: "4.4"
244232
topology: "standalone"
245233
compressor: 'zlib'
@@ -263,7 +251,7 @@ buildvariants:
263251
- matrix_name: "snappy-auth"
264252
matrix_spec:
265253
auth-and-ssl: "auth-and-ssl"
266-
ruby: ["ruby-2.7"]
254+
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
267255
mongodb-version: "4.4"
268256
topology: "replica-set"
269257
compressor: 'snappy'
@@ -272,24 +260,12 @@ buildvariants:
272260
tasks:
273261
- name: "test-mlaunch"
274262

275-
- matrix_name: "snappy-auth-3.0"
276-
matrix_spec:
277-
auth-and-ssl: "auth-and-ssl"
278-
ruby: ["ruby-3.0"]
279-
mongodb-version: "4.4"
280-
topology: "standalone"
281-
compressor: 'snappy'
282-
os: ubuntu1604
283-
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
284-
tasks:
285-
- name: "test-mlaunch"
286-
287263
- matrix_name: "snappy-noauth"
288264
matrix_spec:
289265
auth-and-ssl: "noauth-and-nossl"
290266
ruby: "ruby-2.5"
291267
mongodb-version: ["3.6"]
292-
topology: replica-set
268+
topology: standalone
293269
compressor: 'snappy'
294270
os: ubuntu1604
295271
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -312,7 +288,7 @@ buildvariants:
312288
- matrix_name: "zstd-auth"
313289
matrix_spec:
314290
auth-and-ssl: "auth-and-ssl"
315-
ruby: ["ruby-2.7"]
291+
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
316292
mongodb-version: "4.4"
317293
topology: "replica-set"
318294
compressor: 'zstd'
@@ -321,18 +297,6 @@ buildvariants:
321297
tasks:
322298
- name: "test-mlaunch"
323299

324-
- matrix_name: "zstd-auth-3.0"
325-
matrix_spec:
326-
auth-and-ssl: "auth-and-ssl"
327-
ruby: ["ruby-3.0"]
328-
mongodb-version: "4.4"
329-
topology: "standalone"
330-
compressor: 'zstd'
331-
os: ubuntu1604
332-
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
333-
tasks:
334-
- name: "test-mlaunch"
335-
336300
- matrix_name: "zstd-noauth"
337301
matrix_spec:
338302
auth-and-ssl: "noauth-and-nossl"
@@ -369,7 +333,7 @@ buildvariants:
369333

370334
- matrix_name: "activesupport"
371335
matrix_spec:
372-
ruby: ["ruby-3.0", "ruby-2.7"]
336+
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
373337
mongodb-version: '4.4'
374338
topology: replica-set
375339
as: as
@@ -380,7 +344,7 @@ buildvariants:
380344

381345
- matrix_name: "bson"
382346
matrix_spec:
383-
ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
347+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7, jruby-9.2]
384348
mongodb-version: '4.4'
385349
topology: replica-set
386350
bson: "*"
@@ -438,8 +402,8 @@ buildvariants:
438402
matrix_spec:
439403
auth-and-ssl: "noauth-and-nossl"
440404
# https://jira.mongodb.org/browse/RUBY-2832
441-
# ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
442-
ruby: [ruby-3.0, ruby-2.7]
405+
# ruby: [ruby-3.1, ruby-3.0, ruby-2.7, jruby-9.2]
406+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
443407
topology: standalone
444408
mongodb-version: ['4.4']
445409
os: ubuntu1804
@@ -495,13 +459,13 @@ buildvariants:
495459
- name: "test-aws-auth"
496460

497461
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
498-
# TODO Add ruby-3.0: RUBY-2717
462+
# TODO Add ruby-3.1, ruby-3.0: RUBY-2717
499463
<%|= standard_debian_rubies(%w(ruby-2.5 ruby-2.6 ruby-2.7), key: 'docker-distro') do %>
500464
matrix_name: ocsp-verifier
501465
matrix_spec:
502466
ocsp-verifier: true
503467
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
504-
ruby: [ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5]
468+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5]
505469
topology: standalone
506470
mongodb-version: '4.4'
507471
os: ubuntu1604
@@ -515,7 +479,7 @@ buildvariants:
515479
ocsp-algorithm: ecdsa
516480
ocsp-must-staple: on
517481
ocsp-delegate: on
518-
ruby: [ruby-3.0, ruby-2.7]
482+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
519483
topology: standalone
520484
mongodb-version: '4.4'
521485
os: ubuntu1604
@@ -528,7 +492,7 @@ buildvariants:
528492
matrix_spec:
529493
ocsp-algorithm: rsa
530494
ocsp-status: unknown
531-
ruby: [ruby-3.0, ruby-2.7]
495+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
532496
topology: standalone
533497
mongodb-version: '4.4'
534498
os: ubuntu1604
@@ -558,7 +522,7 @@ buildvariants:
558522
ocsp-delegate: '*'
559523
ocsp-connectivity: <%= outcome %>
560524
extra-uri-options: "<%= extra_uri_options %>"
561-
ruby: [ruby-3.0, ruby-2.7]
525+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
562526
topology: standalone
563527
mongodb-version: '4.4'
564528
os: ubuntu1604

.github/workflows/test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [ ubuntu-latest ]
15-
ruby: ["2.5", "2.6", "2.7", "3.0"]
15+
ruby: ["2.5", "2.6", "2.7", "3.0", "3.1"]
1616
mongodb: ["3.6", "4.4", "5.0"]
1717
topology: [replica_set, sharded_cluster]
1818
include:
@@ -40,6 +40,10 @@ jobs:
4040
ruby: "3.0"
4141
mongodb: "5.0"
4242
topology: server
43+
- os: ubuntu-latest
44+
ruby: "3.1"
45+
mongodb: "5.0"
46+
topology: server
4347
- os: ubuntu-18.04
4448
ruby: "2.5"
4549
mongodb: "3.6"

0 commit comments

Comments
 (0)