Skip to content

Commit c95c485

Browse files
comandeo-mongojohnnyshields
comandeo-mongo
and
johnnyshields
authored
Add Ruby 3.2 support (#5644) (#5648)
* Add Ruby 3.2 support (#5644) * Bring egos back * Revert "Bring egos back" This reverts commit 6367f1f. * Bump shared * Remove mentions of Bignum and Fixnum. These were combined into Integer in Ruby 2.4 (#5470) Co-authored-by: shields <[email protected]> * Remove rspec-mock-diag * Update specs --------- Co-authored-by: Johnny Shields <[email protected]> Co-authored-by: shields <[email protected]>
1 parent 6885e31 commit c95c485

File tree

14 files changed

+1036
-392
lines changed

14 files changed

+1036
-392
lines changed

‎.evergreen/config.yml

+88-55
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,6 @@ functions:
3838
3939
git submodule update --init --recursive
4040
41-
"fetch egos":
42-
- command: shell.exec
43-
params:
44-
working_dir: "src"
45-
script: |
46-
set -ex
47-
48-
curl -sfLo egos https://raw.githubusercontent.com/p-mongo/egos/master/egos
49-
chmod +x ./egos
50-
5141
"create expansions":
5242
# Make an evergreen exapanstion file with dynamic values
5343
- command: shell.exec
@@ -282,7 +272,8 @@ functions:
282272
DRIVER="${DRIVER}" \
283273
I18N="${I18N}" \
284274
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
285-
./egos .evergreen/run-tests-docker.sh
275+
FLE="${FLE}" \
276+
.evergreen/run-tests-docker.sh
286277
287278
"fix absolute paths":
288279
- command: shell.exec
@@ -305,7 +296,6 @@ functions:
305296
306297
pre:
307298
- func: "fetch source"
308-
- func: "fetch egos"
309299
- func: "create expansions"
310300
- func: "fix absolute paths"
311301
- func: "install dependencies"
@@ -325,10 +315,18 @@ axes:
325315
- id: "mongodb-version"
326316
display_name: MongoDB Version
327317
values:
318+
- id: "latest"
319+
display_name: "MongoDB Latest"
320+
variables:
321+
VERSION: "latest"
322+
- id: "7.0"
323+
display_name: "MongoDB 7.0"
324+
variables:
325+
VERSION: "7.0"
328326
- id: "6.0"
329327
display_name: "MongoDB 6.0"
330328
variables:
331-
VERSION: "5.0"
329+
VERSION: "6.0"
332330
- id: "5.3"
333331
display_name: "MongoDB 5.3"
334332
variables:
@@ -414,6 +412,10 @@ axes:
414412
display_name: ruby-3.1
415413
variables:
416414
RVM_RUBY: "ruby-3.1"
415+
- id: "ruby-3.2"
416+
display_name: ruby-3.2
417+
variables:
418+
RVM_RUBY: "ruby-3.2"
417419
- id: "ruby-head"
418420
display_name: ruby-head
419421
variables:
@@ -430,29 +432,24 @@ axes:
430432
- id: "os"
431433
display_name: OS
432434
values:
433-
- id: ubuntu-16.04
434-
display_name: "Ubuntu 16.04"
435-
run_on: ubuntu1604-small
436-
variables:
437-
DOCKER_DISTRO: ubuntu1604
438435
- id: ubuntu-18.04
439436
display_name: "Ubuntu 18.04"
440-
run_on: ubuntu1804-small
437+
run_on: ubuntu2004-small
441438
variables:
442439
DOCKER_DISTRO: ubuntu1804
443-
- id: ubuntu-20.04
440+
- id: ubuntu-22.04
444441
display_name: "Ubuntu 20.04"
445442
run_on: ubuntu2004-small
446443
variables:
447-
DOCKER_DISTRO: ubuntu2004
448-
- id: rhel70
449-
display_name: "RHEL 7.0"
450-
run_on: rhel70-small
444+
DOCKER_DISTRO: ubuntu2204
445+
- id: debian11
446+
display_name: "Debian 11"
447+
run_on: ubuntu2004-small
451448
variables:
452-
DOCKER_DISTRO: rhel70
449+
DOCKER_DISTRO: debian11
453450
- id: rhel80
454451
display_name: "RHEL 8.0"
455-
run_on: rhel80-small
452+
run_on: ubuntu2004-small
456453
variables:
457454
DOCKER_DISTRO: rhel80
458455

@@ -553,25 +550,48 @@ axes:
553550
display_name: Yes
554551
variables:
555552
APP_TESTS: yes
553+
554+
- id: "fle"
555+
display_name: FLE
556+
values:
557+
- id: "helper"
558+
display_name: via LMC helper
559+
variables:
560+
FLE: helper
561+
- id: "path"
562+
display_name: via LMC path
563+
variables:
564+
FLE: path
556565
buildvariants:
557-
- matrix_name: "ruby-3.1"
566+
- matrix_name: "ruby-3.2"
558567
matrix_spec:
559-
ruby: ["ruby-3.1"]
568+
ruby: ["ruby-3.2"]
560569
driver: ["current"]
561570
topology: '*'
562571
mongodb-version: ['6.0']
563-
os: ubuntu-20.04
572+
os: debian11
573+
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
574+
tasks:
575+
- name: "test"
576+
577+
- matrix_name: "mongodb-latest"
578+
matrix_spec:
579+
ruby: ["ruby-3.2"]
580+
driver: ["current"]
581+
topology: '*'
582+
mongodb-version: ['latest']
583+
os: debian11
564584
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
565585
tasks:
566586
- name: "test"
567587

568-
- matrix_name: "mongodb-5.3"
588+
- matrix_name: "ruby-3.1"
569589
matrix_spec:
570590
ruby: ["ruby-3.1"]
571591
driver: ["current"]
572592
topology: '*'
573-
mongodb-version: ['5.3']
574-
os: ubuntu-20.04
593+
mongodb-version: ['6.0']
594+
os: ubuntu-22.04
575595
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
576596
tasks:
577597
- name: "test"
@@ -582,7 +602,7 @@ buildvariants:
582602
driver: ["current"]
583603
topology: ['replica-set']
584604
mongodb-version: ['5.0']
585-
os: ubuntu-20.04
605+
os: rhel80
586606
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
587607
tasks:
588608
- name: "test"
@@ -593,7 +613,7 @@ buildvariants:
593613
driver: ["current"]
594614
topology: ['replica-set', 'sharded-cluster']
595615
mongodb-version: '5.0'
596-
os: ubuntu-18.04
616+
os: rhel80
597617
display_name: "${jruby}, ${driver}, ${mongodb-version}, ${topology}"
598618
tasks:
599619
- name: "test"
@@ -604,7 +624,7 @@ buildvariants:
604624
driver: ["current"]
605625
topology: '*'
606626
mongodb-version: ['4.4']
607-
os: ubuntu-18.04
627+
os: rhel80
608628
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
609629
tasks:
610630
- name: "test"
@@ -615,18 +635,18 @@ buildvariants:
615635
driver: ["current"]
616636
topology: ['replica-set']
617637
mongodb-version: ['4.0']
618-
os: ubuntu-16.04
638+
os: rhel80
619639
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
620640
tasks:
621641
- name: "test"
622642

623643
- matrix_name: "driver-upcoming"
624644
matrix_spec:
625645
driver: [master, stable]
626-
ruby: ["ruby-3.1"]
627-
mongodb-version: "5.0"
646+
ruby: ["ruby-3.2"]
647+
mongodb-version: "6.0"
628648
topology: ['replica-set', 'sharded-cluster']
629-
os: ubuntu-20.04
649+
os: debian11
630650
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
631651
tasks:
632652
- name: "test"
@@ -637,7 +657,7 @@ buildvariants:
637657
ruby: ["ruby-2.6"]
638658
mongodb-version: "4.0"
639659
topology: ['replica-set', 'sharded-cluster']
640-
os: ubuntu-18.04
660+
os: rhel80
641661
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
642662
tasks:
643663
- name: "test"
@@ -648,19 +668,19 @@ buildvariants:
648668
ruby: ["ruby-2.6"]
649669
mongodb-version: "3.6"
650670
topology: "standalone"
651-
os: ubuntu-16.04
671+
os: rhel80
652672
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
653673
tasks:
654674
- name: "test"
655675

656676
- matrix_name: "rails-7"
657677
matrix_spec:
658-
ruby: ["ruby-3.0"]
678+
ruby: ["ruby-3.2"]
659679
driver: ["current"]
660-
mongodb-version: "5.0"
680+
mongodb-version: "6.0"
661681
topology: "standalone"
662682
rails: ['7.0']
663-
os: ubuntu-20.04
683+
os: debian11
664684
display_name: "${rails}, ${driver}, ${mongodb-version}"
665685
tasks:
666686
- name: "test"
@@ -671,7 +691,7 @@ buildvariants:
671691
ruby: ["ruby-2.7"]
672692
mongodb-version: "5.0"
673693
topology: "standalone"
674-
os: ubuntu-18.04
694+
os: rhel80
675695
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
676696
tasks:
677697
- name: "test"
@@ -682,7 +702,7 @@ buildvariants:
682702
ruby: ["ruby-3.0"]
683703
mongodb-version: "5.0"
684704
topology: "standalone"
685-
os: ubuntu-18.04
705+
os: rhel80
686706
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
687707
tasks:
688708
- name: "test"
@@ -692,10 +712,10 @@ buildvariants:
692712
matrix_spec:
693713
ruby: ["ruby-3.0"]
694714
driver: ["current"]
695-
mongodb-version: "5.0"
715+
mongodb-version: "6.0"
696716
topology: "standalone"
697717
rails: ['6.0', '6.1']
698-
os: ubuntu-20.04
718+
os: rhel80
699719
display_name: "${rails}, ${driver}, ${mongodb-version}"
700720
tasks:
701721
- name: "test"
@@ -707,7 +727,7 @@ buildvariants:
707727
mongodb-version: "4.0"
708728
topology: "standalone"
709729
rails: ['5.2']
710-
os: ubuntu-18.04
730+
os: rhel80
711731
display_name: "${rails}, ${driver}, ${mongodb-version}"
712732
tasks:
713733
- name: "test"
@@ -719,7 +739,7 @@ buildvariants:
719739
mongodb-version: "4.4"
720740
topology: "standalone"
721741
i18n: '1.0'
722-
os: ubuntu-18.04
742+
os: rhel80
723743
display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
724744
tasks:
725745
- name: "test"
@@ -732,20 +752,20 @@ buildvariants:
732752
topology: "standalone"
733753
i18n: '*'
734754
test-i18n-fallbacks: yes
735-
os: ubuntu-18.04
755+
os: rhel80
736756
display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}, ${i18n}"
737757
tasks:
738758
- name: "test"
739759

740760
- matrix_name: app-tests-ruby-3
741761
matrix_spec:
742-
ruby: ["ruby-3.0", "ruby-3.1"]
762+
ruby: ["ruby-3.0", "ruby-3.1", "ruby-3.2"]
743763
driver: ["current"]
744-
mongodb-version: '5.0'
764+
mongodb-version: '6.0'
745765
topology: standalone
746766
app-tests: yes
747767
rails: ['6.0', '6.1', '7.0']
748-
os: ubuntu-20.04
768+
os: rhel80
749769
display_name: "app tests ${driver}, ${ruby}, ${rails}"
750770
tasks:
751771
- name: "test"
@@ -758,7 +778,7 @@ buildvariants:
758778
topology: standalone
759779
app-tests: yes
760780
rails: ['5.2']
761-
os: ubuntu-18.04
781+
os: rhel80
762782
display_name: "app tests ${driver}, ${ruby}, ${rails}"
763783
tasks:
764784
- name: "test"
@@ -775,3 +795,16 @@ buildvariants:
775795
display_name: "app tests ${driver}, ${jruby}"
776796
tasks:
777797
- name: "test"
798+
799+
- matrix_name: "auto-encryption"
800+
matrix_spec:
801+
ruby: ruby-3.1
802+
driver: current
803+
topology: replica-set
804+
mongodb-version: ['6.0']
805+
os: ubuntu-22.04
806+
rails: ['7.0']
807+
fle: helper
808+
display_name: "FLE: ${rails}, ${driver}, ${mongodb-version}"
809+
tasks:
810+
- name: "test"

0 commit comments

Comments
 (0)