Skip to content

Commit 74e4e38

Browse files
jamisjamis
authored
RUBY-3424 Prep for 2.20 (#2852)
* prep for 2.20 * more CI stuff (e.g. DriverBench should run against latest stable, not latest) * let's see what happens when we enable jruby 9.4 * document added support for JRuby 9.4, and deprecation of 9.2 * flesh out the release notes more
1 parent 0c65ebf commit 74e4e38

File tree

8 files changed

+101
-83
lines changed

8 files changed

+101
-83
lines changed

Diff for: ‎.evergreen/config.yml

+21-37
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GENERATED FILE - DO NOT EDIT.
2-
# Run ./.evergreen/update-evergreen-configs to regenerate this file.
2+
# Run `rake eg` to regenerate this file.
33

44
# When a task that used to pass starts to fail, go through all versions that
55
# may have been skipped to detect when the task started failing.
@@ -1008,22 +1008,10 @@ axes:
10081008
display_name: ruby-2.7
10091009
variables:
10101010
RVM_RUBY: "ruby-2.7"
1011-
- id: "ruby-2.6"
1012-
display_name: ruby-2.6
1013-
variables:
1014-
RVM_RUBY: "ruby-2.6"
1015-
- id: "ruby-2.5"
1016-
display_name: ruby-2.5
1017-
variables:
1018-
RVM_RUBY: "ruby-2.5"
10191011
- id: "ruby-head"
10201012
display_name: ruby-head
10211013
variables:
10221014
RVM_RUBY: "ruby-head"
1023-
- id: "jruby-9.2"
1024-
display_name: jruby-9.2
1025-
variables:
1026-
RVM_RUBY: "jruby-9.2"
10271015
- id: "jruby-9.3"
10281016
display_name: jruby-9.3
10291017
variables:
@@ -1257,12 +1245,11 @@ axes:
12571245
- id: no
12581246
display_name: No
12591247

1260-
12611248
buildvariants:
12621249
- matrix_name: DriverBench
12631250
matrix_spec:
12641251
ruby: "ruby-3.2"
1265-
mongodb-version: latest
1252+
mongodb-version: "7.0"
12661253
topology: standalone
12671254
run_on: rhel80-large
12681255
display_name: DriverBench
@@ -1282,7 +1269,7 @@ buildvariants:
12821269

12831270
- matrix_name: "mongo-recent"
12841271
matrix_spec:
1285-
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.3"]
1272+
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
12861273
mongodb-version: ["latest", "7.0", "6.0"]
12871274
topology: ["standalone", "replica-set", "sharded-cluster"]
12881275
os: ['rhel8']
@@ -1292,9 +1279,6 @@ buildvariants:
12921279
tasks:
12931280
- name: "test-mlaunch"
12941281

1295-
# Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
1296-
# issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
1297-
# and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
12981282
- matrix_name: "mongo-recent-arm"
12991283
matrix_spec:
13001284
ruby: "ruby-3.2"
@@ -1307,7 +1291,7 @@ buildvariants:
13071291

13081292
- matrix_name: "mongo-5.x"
13091293
matrix_spec:
1310-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1294+
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
13111295
mongodb-version: ['5.3', '5.0']
13121296
topology: ["standalone", "replica-set", "sharded-cluster"]
13131297
os: rhel8
@@ -1317,7 +1301,7 @@ buildvariants:
13171301

13181302
- matrix_name: "mongo-4.x"
13191303
matrix_spec:
1320-
ruby: ["ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1304+
ruby: ["ruby-3.0", "ruby-2.7"]
13211305
mongodb-version: ['4.4', '4.2', '4.0']
13221306
topology: ["standalone", "replica-set", "sharded-cluster"]
13231307
os: rhel8
@@ -1327,7 +1311,7 @@ buildvariants:
13271311

13281312
- matrix_name: "mongo-3.6"
13291313
matrix_spec:
1330-
ruby: "ruby-2.5"
1314+
ruby: "ruby-2.7"
13311315
mongodb-version: ['3.6']
13321316
topology: ["standalone", "replica-set", "sharded-cluster"]
13331317
os: rhel8
@@ -1392,7 +1376,7 @@ buildvariants:
13921376

13931377
- matrix_name: mmapv1
13941378
matrix_spec:
1395-
ruby: "ruby-2.5"
1379+
ruby: "ruby-2.7"
13961380
mongodb-version: ['3.6', '4.0']
13971381
topology: ["standalone", "replica-set", "sharded-cluster"]
13981382
storage-engine: mmapv1
@@ -1426,7 +1410,7 @@ buildvariants:
14261410
- matrix_name: "solo"
14271411
matrix_spec:
14281412
solo: on
1429-
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1413+
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
14301414
mongodb-version: "7.0"
14311415
topology: ["standalone", "replica-set", "sharded-cluster"]
14321416
os: rhel8
@@ -1475,7 +1459,7 @@ buildvariants:
14751459
- matrix_name: "jruby-auth"
14761460
matrix_spec:
14771461
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
1478-
ruby: jruby-9.3
1462+
ruby: jruby-9.4
14791463
mongodb-version: "7.0"
14801464
topology: ["standalone", "replica-set", "sharded-cluster"]
14811465
os: rhel8
@@ -1486,7 +1470,7 @@ buildvariants:
14861470
- matrix_name: "zlib"
14871471
matrix_spec:
14881472
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
1489-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1473+
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
14901474
mongodb-version: "7.0"
14911475
topology: "replica-set"
14921476
compressor: 'zlib'
@@ -1498,7 +1482,7 @@ buildvariants:
14981482
- matrix_name: "snappy"
14991483
matrix_spec:
15001484
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
1501-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1485+
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
15021486
mongodb-version: "7.0"
15031487
topology: "replica-set"
15041488
compressor: 'snappy'
@@ -1525,7 +1509,7 @@ buildvariants:
15251509

15261510
- matrix_name: "activesupport"
15271511
matrix_spec:
1528-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1512+
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
15291513
mongodb-version: "7.0"
15301514
topology: replica-set
15311515
as: as
@@ -1536,7 +1520,7 @@ buildvariants:
15361520

15371521
- matrix_name: "bson"
15381522
matrix_spec:
1539-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1523+
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
15401524
mongodb-version: "7.0"
15411525
topology: replica-set
15421526
bson: "*"
@@ -1548,7 +1532,7 @@ buildvariants:
15481532
# kerberos integration tests are broken (RUBY-3266)
15491533
# - matrix_name: "kerberos-integration"
15501534
# matrix_spec:
1551-
# ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1535+
# ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
15521536
# os: rhel8
15531537
# display_name: "Kerberos integration ${os} ${ruby}"
15541538
# tasks:
@@ -1609,7 +1593,7 @@ buildvariants:
16091593
matrix_spec:
16101594
ocsp-verifier: true
16111595
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
1612-
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1596+
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
16131597
topology: standalone
16141598
mongodb-version: "7.0"
16151599
os: rhel8
@@ -1783,7 +1767,7 @@ buildvariants:
17831767
ocsp-status: [valid, unknown]
17841768
ocsp-delegate: '*'
17851769
ocsp-connectivity: pass
1786-
ruby: jruby-9.3
1770+
ruby: jruby-9.4
17871771
topology: standalone
17881772
mongodb-version: "7.0"
17891773
os: rhel8
@@ -1825,7 +1809,7 @@ buildvariants:
18251809

18261810
- matrix_name: "atlas"
18271811
matrix_spec:
1828-
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1812+
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
18291813
os: rhel8
18301814
display_name: "Atlas tests ${ruby}"
18311815
tasks:
@@ -1835,8 +1819,8 @@ buildvariants:
18351819
# - matrix_name: "serverless"
18361820
# matrix_spec:
18371821
# # https://jira.mongodb.org/browse/RUBY-3217
1838-
# # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1839-
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1822+
# # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
1823+
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
18401824
# fle: path
18411825
# os: rhel8
18421826
# display_name: "Atlas serverless ${ruby}"
@@ -1846,8 +1830,8 @@ buildvariants:
18461830
# - matrix_name: "serverless-next"
18471831
# matrix_spec:
18481832
# # https://jira.mongodb.org/browse/RUBY-3217
1849-
# # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1850-
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1833+
# # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
1834+
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
18511835
# fle: path
18521836
# os: rhel8
18531837
# display_name: "Atlas serverless-next ${ruby}"

Diff for: ‎.evergreen/config/axes.yml.erb

-13
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,10 @@ axes:
162162
display_name: ruby-2.7
163163
variables:
164164
RVM_RUBY: "ruby-2.7"
165-
- id: "ruby-2.6"
166-
display_name: ruby-2.6
167-
variables:
168-
RVM_RUBY: "ruby-2.6"
169-
- id: "ruby-2.5"
170-
display_name: ruby-2.5
171-
variables:
172-
RVM_RUBY: "ruby-2.5"
173165
- id: "ruby-head"
174166
display_name: ruby-head
175167
variables:
176168
RVM_RUBY: "ruby-head"
177-
- id: "jruby-9.2"
178-
display_name: jruby-9.2
179-
variables:
180-
RVM_RUBY: "jruby-9.2"
181169
- id: "jruby-9.3"
182170
display_name: jruby-9.3
183171
variables:
@@ -405,4 +393,3 @@ axes:
405393
API_VERSION_REQUIRED: 1
406394
- id: no
407395
display_name: No
408-

Diff for: ‎.evergreen/config/standard.yml.erb

+8-17
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
11
<%
22
topologies = %w( standalone replica-set sharded-cluster )
33

4-
# jruby-9.4 is available in the toolchain, but tests break. It will
5-
# require some investigation. Once available:
6-
# 1. replace jruby-9.3 with jruby-9.4 in `recent_rubies` and
7-
# `sample_rubies`.
8-
# 2. add jruby-9.4 to the front of `jrubies`.
9-
104
# latest_ruby = the most recently released, stable version of Ruby
115
# (make sure this version is being built by 10gen/mongo-ruby-toolchain)
126
latest_ruby = "ruby-3.2".inspect # so it gets quoted as a string
137

148
# these are used for testing against a few recent ruby versions
15-
recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.3 )
9+
recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.4 )
1610

1711
# this is a list of the most most recent 3.x and 2.x MRI ruby versions
1812
sample_mri_rubies = %w( ruby-3.2 ruby-2.7 )
1913

2014
# as above, but including the most recent JRuby release
21-
sample_rubies = sample_mri_rubies + %w( jruby-9.3 )
15+
sample_rubies = sample_mri_rubies + %w( jruby-9.4 )
2216

2317
# older Ruby versions provided by 10gen/mongo-ruby-toolchain
24-
older_rubies = %w( ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 )
18+
older_rubies = %w( ruby-3.0 ruby-2.7 )
2519

2620
# all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
27-
jrubies = %w( jruby-9.3 jruby-9.2 )
21+
jrubies = %w( jruby-9.4 jruby-9.3 )
2822

2923
supported_mri_rubies = %w( ruby-3.2 ruby-3.1 ruby-3.0
30-
ruby-2.7 ruby-2.6 ruby-2.5 )
24+
ruby-2.7 )
3125

3226
supported_rubies = supported_mri_rubies + jrubies
3327

@@ -45,7 +39,7 @@ buildvariants:
4539
- matrix_name: DriverBench
4640
matrix_spec:
4741
ruby: <%= latest_ruby %>
48-
mongodb-version: latest
42+
mongodb-version: <%= latest_stable_mdb %>
4943
topology: standalone
5044
run_on: rhel80-large
5145
display_name: DriverBench
@@ -75,9 +69,6 @@ buildvariants:
7569
tasks:
7670
- name: "test-mlaunch"
7771

78-
# Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
79-
# issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
80-
# and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
8172
- matrix_name: "mongo-recent-arm"
8273
matrix_spec:
8374
ruby: <%= latest_ruby %>
@@ -110,7 +101,7 @@ buildvariants:
110101

111102
- matrix_name: "mongo-3.6"
112103
matrix_spec:
113-
ruby: "ruby-2.5"
104+
ruby: "ruby-2.7"
114105
mongodb-version: ['3.6']
115106
topology: <%= topologies %>
116107
os: rhel8
@@ -175,7 +166,7 @@ buildvariants:
175166

176167
- matrix_name: mmapv1
177168
matrix_spec:
178-
ruby: "ruby-2.5"
169+
ruby: "ruby-2.7"
179170
mongodb-version: ['3.6', '4.0']
180171
topology: <%= topologies %>
181172
storage-engine: mmapv1

Diff for: ‎.evergreen/update-evergreen-configs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Runner
1313
def transform(output_file_name)
1414
contents = <<-EOT
1515
# GENERATED FILE - DO NOT EDIT.
16-
# Run ./.evergreen/update-evergreen-configs to regenerate this file.
16+
# Run `rake eg` to regenerate this file.
1717
1818
EOT
1919

Diff for: ‎.github/workflows/test.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ ubuntu-20.04 ]
19-
ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2"]
20-
mongodb: ["3.6", "4.4", "5.0"]
19+
ruby: ["2.7", "3.0", "3.1", "3.2"]
20+
mongodb: ["3.6", "4.4", "5.0", "6.0", "7.0"]
2121
topology: [replica_set, sharded_cluster]
2222
include:
23-
- os: macos
24-
ruby: "2.6"
25-
mongodb: "5.0"
26-
topology: server
2723
- os: macos
2824
ruby: "2.7"
2925
mongodb: "5.0"
@@ -32,10 +28,6 @@ jobs:
3228
ruby: "3.0"
3329
mongodb: "5.0"
3430
topology: server
35-
- os: ubuntu-latest
36-
ruby: "2.6"
37-
mongodb: "5.0"
38-
topology: server
3931
- os: ubuntu-latest
4032
ruby: "2.7"
4133
mongodb: "5.0"
@@ -48,10 +40,6 @@ jobs:
4840
ruby: "3.2"
4941
mongodb: "5.0"
5042
topology: server
51-
- os: ubuntu-18.04
52-
ruby: "2.5"
53-
mongodb: "3.6"
54-
topology: replica_set
5543
- os: ubuntu-latest
5644
ruby: "3.2"
5745
mongodb: "6.0"

0 commit comments

Comments
 (0)