Skip to content

Commit 0faa9f4

Browse files
comandeo-mongocomandeo-mongo
committed
Merge branch 'master' into drivers-2769 
2 parents c252dbd + dd1adad commit 0faa9f4

File tree

17 files changed

+220
-182
lines changed

17 files changed

+220
-182
lines changed

‎.evergreen/config.yml

Lines changed: 68 additions & 87 deletions
Large diffs are not rendered by default.

‎.evergreen/config/axes.yml.erb

Lines changed: 0 additions & 13 deletions
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-

‎.evergreen/config/standard.yml.erb

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
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

3428
# The latest stable version of MongoDB
35-
latest_stable_mdb = "6.0".inspect # so it gets quoted as a string
29+
latest_stable_mdb = "7.0".inspect # so it gets quoted as a string
3630

3731
# A few of the most recent MongoDB versions
3832
actual_and_upcoming_mdb = %w( latest 7.0 6.0 )
33+
3934
recent_mdb = %w( 6.0 5.3 )
4035
latest_5x_mdb = "5.3".inspect # so it gets quoted as a string
4136
%>
@@ -44,7 +39,7 @@ buildvariants:
4439
- matrix_name: DriverBench
4540
matrix_spec:
4641
ruby: <%= latest_ruby %>
47-
mongodb-version: latest
42+
mongodb-version: <%= latest_stable_mdb %>
4843
topology: standalone
4944
run_on: rhel80-large
5045
display_name: DriverBench
@@ -74,17 +69,10 @@ buildvariants:
7469
tasks:
7570
- name: "test-mlaunch"
7671

77-
# Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
78-
# issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
79-
# and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
80-
#
81-
# further: 'latest' is broken until the QE2 changes are merged (RUBY-3211,
82-
# RUBY-3226)
8372
- matrix_name: "mongo-recent-arm"
8473
matrix_spec:
8574
ruby: <%= latest_ruby %>
86-
#mongodb-version: ['latest', '6.0']
87-
mongodb-version: ['6.0']
75+
mongodb-version: <%= actual_and_upcoming_mdb %>
8876
topology: <%= topologies %>
8977
os: 'rhel8-arm'
9078
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -113,7 +101,7 @@ buildvariants:
113101

114102
- matrix_name: "mongo-3.6"
115103
matrix_spec:
116-
ruby: "ruby-2.5"
104+
ruby: "ruby-2.7"
117105
mongodb-version: ['3.6']
118106
topology: <%= topologies %>
119107
os: rhel8
@@ -178,7 +166,7 @@ buildvariants:
178166

179167
- matrix_name: mmapv1
180168
matrix_spec:
181-
ruby: "ruby-2.5"
169+
ruby: "ruby-2.7"
182170
mongodb-version: ['3.6', '4.0']
183171
topology: <%= topologies %>
184172
storage-engine: mmapv1
@@ -520,27 +508,28 @@ buildvariants:
520508
tasks:
521509
- name: test-atlas
522510

523-
- matrix_name: "serverless"
524-
matrix_spec:
525-
# https://jira.mongodb.org/browse/RUBY-3217
526-
# ruby: <%= supported_rubies %>
527-
ruby: <%= supported_mri_rubies %>
528-
fle: path
529-
os: rhel8
530-
display_name: "Atlas serverless ${ruby}"
531-
tasks:
532-
- name: serverless_task_group
533-
534-
- matrix_name: "serverless-next"
535-
matrix_spec:
536-
# https://jira.mongodb.org/browse/RUBY-3217
537-
# ruby: <%= supported_rubies %>
538-
ruby: <%= supported_mri_rubies %>
539-
fle: path
540-
os: rhel8
541-
display_name: "Atlas serverless-next ${ruby}"
542-
tasks:
543-
- name: serverless_next_task_group
511+
# Commented out, pending RUBY-3414
512+
# - matrix_name: "serverless"
513+
# matrix_spec:
514+
# # https://jira.mongodb.org/browse/RUBY-3217
515+
# # ruby: <%= supported_rubies %>
516+
# ruby: <%= supported_mri_rubies %>
517+
# fle: path
518+
# os: rhel8
519+
# display_name: "Atlas serverless ${ruby}"
520+
# tasks:
521+
# - name: serverless_task_group
522+
#
523+
# - matrix_name: "serverless-next"
524+
# matrix_spec:
525+
# # https://jira.mongodb.org/browse/RUBY-3217
526+
# # ruby: <%= supported_rubies %>
527+
# ruby: <%= supported_mri_rubies %>
528+
# fle: path
529+
# os: rhel8
530+
# display_name: "Atlas serverless-next ${ruby}"
531+
# tasks:
532+
# - name: serverless_next_task_group
544533

545534
- matrix_name: "aws-lambda"
546535
matrix_spec:

‎.evergreen/update-evergreen-configs

Lines changed: 1 addition & 1 deletion
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

‎.github/workflows/test.yml

Lines changed: 2 additions & 14 deletions
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"

‎docs/reference/driver-compatibility.txt

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ version.
5757
- MongoDB 3.0
5858
- MongoDB 2.6
5959

60+
* - 2.20
61+
- |checkmark|
62+
- |checkmark|
63+
- |checkmark|
64+
- |checkmark|
65+
- |checkmark|
66+
- |checkmark|
67+
- |checkmark|
68+
-
69+
-
70+
-
71+
-
72+
6073
* - 2.19
6174
- |checkmark|
6275
- |checkmark|
@@ -292,10 +305,29 @@ for that Ruby version is deprecated.
292305
- Ruby 2.1
293306
- Ruby 2.0
294307
- Ruby 1.9
308+
- JRuby 9.4
295309
- JRuby 9.3
296310
- JRuby 9.2
297311
- JRuby 9.1
298312

313+
* - 2.20
314+
- |checkmark|
315+
- |checkmark|
316+
- |checkmark|
317+
- D
318+
-
319+
-
320+
-
321+
-
322+
-
323+
-
324+
-
325+
-
326+
- |checkmark|
327+
- |checkmark|
328+
- D
329+
-
330+
299331
* - 2.19
300332
- |checkmark|
301333
- |checkmark|
@@ -309,6 +341,7 @@ for that Ruby version is deprecated.
309341
-
310342
-
311343
-
344+
-
312345
- |checkmark|
313346
- |checkmark|
314347
-
@@ -326,6 +359,7 @@ for that Ruby version is deprecated.
326359
-
327360
-
328361
-
362+
-
329363
- |checkmark|
330364
- |checkmark|
331365
-
@@ -344,6 +378,7 @@ for that Ruby version is deprecated.
344378
-
345379
-
346380
-
381+
-
347382
- |checkmark|
348383
-
349384

@@ -361,6 +396,7 @@ for that Ruby version is deprecated.
361396
-
362397
-
363398
-
399+
-
364400
- |checkmark|
365401
-
366402

@@ -378,6 +414,7 @@ for that Ruby version is deprecated.
378414
-
379415
-
380416
-
417+
-
381418
- |checkmark|
382419
-
383420

@@ -395,6 +432,7 @@ for that Ruby version is deprecated.
395432
-
396433
-
397434
-
435+
-
398436
- |checkmark|
399437
-
400438

@@ -412,6 +450,7 @@ for that Ruby version is deprecated.
412450
-
413451
-
414452
-
453+
-
415454
- |checkmark|
416455
-
417456

@@ -429,6 +468,7 @@ for that Ruby version is deprecated.
429468
-
430469
-
431470
-
471+
-
432472
- |checkmark|
433473
-
434474

@@ -446,6 +486,7 @@ for that Ruby version is deprecated.
446486
-
447487
-
448488
-
489+
-
449490
- |checkmark|
450491
-
451492

@@ -463,6 +504,7 @@ for that Ruby version is deprecated.
463504
- D
464505
- D
465506
-
507+
-
466508
- |checkmark|
467509
- |checkmark|
468510

@@ -480,6 +522,7 @@ for that Ruby version is deprecated.
480522
- D
481523
- D
482524
-
525+
-
483526
- |checkmark|
484527
- |checkmark|
485528

@@ -497,6 +540,7 @@ for that Ruby version is deprecated.
497540
- |checkmark|
498541
- |checkmark|
499542
-
543+
-
500544
- |checkmark|
501545
- |checkmark|
502546

@@ -514,6 +558,7 @@ for that Ruby version is deprecated.
514558
- |checkmark|
515559
- |checkmark|
516560
-
561+
-
517562
- |checkmark|
518563
- |checkmark|
519564

@@ -531,6 +576,7 @@ for that Ruby version is deprecated.
531576
- |checkmark|
532577
- |checkmark|
533578
-
579+
-
534580
- |checkmark|
535581
- |checkmark|
536582

0 commit comments

Comments
 (0)