@@ -471,6 +471,10 @@ axes:
471471 display_name : ruby-3.2
472472 variables :
473473 RVM_RUBY : " ruby-3.2"
474+ - id : " ruby-3.3"
475+ display_name : ruby-3.3
476+ variables :
477+ RVM_RUBY : " ruby-3.3"
474478 - id : " ruby-head"
475479 display_name : ruby-head
476480 variables :
@@ -490,16 +494,21 @@ axes:
490494 - id : actual-ubuntu-22.04
491495 display_name : " Ubuntu 22.04"
492496 run_on : ubuntu2204-small
497+ - id : ubuntu-22.04
498+ display_name : " Ubuntu 20.04"
499+ run_on : ubuntu2204-small
500+ variables :
501+ DOCKER_DISTRO : ubuntu2204
493502 - id : ubuntu-20.04
494503 display_name : " Ubuntu 20.04"
495504 run_on : ubuntu2004-small
496505 variables :
497506 DOCKER_DISTRO : ubuntu2004
498- - id : ubuntu-22 .04
507+ - id : ubuntu-18 .04
499508 display_name : " Ubuntu 22.04"
500- run_on : ubuntu2004 -small
509+ run_on : ubuntu1804 -small
501510 variables :
502- DOCKER_DISTRO : ubuntu2204
511+ DOCKER_DISTRO : ubuntu1804
503512 - id : debian11
504513 display_name : " Debian 11"
505514 run_on : ubuntu2004-small
@@ -615,24 +624,35 @@ axes:
615624 variables :
616625 FLE : path
617626buildvariants :
618- - matrix_name : " ruby-3.2"
627+ - matrix_name : " mongodb-latest"
628+ matrix_spec :
629+ ruby : ["ruby-3.3"]
630+ driver : ["current"]
631+ topology : ' *'
632+ mongodb-version : ['latest']
633+ os : ubuntu-22.04
634+ display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
635+ tasks :
636+ - name : " test"
637+
638+ - matrix_name : " ruby-3.3"
619639 matrix_spec :
620640 ruby : ["ruby-3.2"]
621641 driver : ["current"]
622642 topology : ' *'
623- mongodb-version : ['6 .0']
624- os : debian11
643+ mongodb-version : ['7 .0']
644+ os : ubuntu-22.04
625645 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
626646 tasks :
627647 - name : " test"
628648
629- - matrix_name : " mongodb-latest "
649+ - matrix_name : " ruby-3.2 "
630650 matrix_spec :
631651 ruby : ["ruby-3.2"]
632652 driver : ["current"]
633653 topology : ' *'
634- mongodb-version : ['latest ']
635- os : debian11
654+ mongodb-version : ['6.0 ']
655+ os : ubuntu-22.04
636656 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
637657 tasks :
638658 - name : " test"
@@ -654,7 +674,7 @@ buildvariants:
654674 driver : ["current"]
655675 topology : ['replica-set']
656676 mongodb-version : ['5.0']
657- os : rhel80
677+ os : ubuntu-20.04
658678 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
659679 tasks :
660680 - name : " test"
@@ -664,8 +684,8 @@ buildvariants:
664684 jruby : ["jruby-9.4"]
665685 driver : ["current"]
666686 topology : ['replica-set', 'sharded-cluster']
667- mongodb-version : ' 5 .0'
668- os : rhel80
687+ mongodb-version : ' 7 .0'
688+ os : ubuntu-22.04
669689 display_name : " ${jruby}, ${driver}, ${mongodb-version}, ${topology}"
670690 tasks :
671691 - name : " test"
@@ -676,18 +696,18 @@ buildvariants:
676696 driver : ["current"]
677697 topology : ' *'
678698 mongodb-version : ['4.4']
679- os : rhel80
699+ os : ubuntu-20.04
680700 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
681701 tasks :
682702 - name : " test"
683703
684704- matrix_name : " driver-upcoming"
685705 matrix_spec :
686706 driver : [master, stable]
687- ruby : ["ruby-3.2 "]
707+ ruby : ["ruby-3.3 "]
688708 mongodb-version : " 6.0"
689709 topology : ['replica-set', 'sharded-cluster']
690- os : debian11
710+ os : ubuntu-22.04
691711 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
692712 tasks :
693713 - name : " test"
@@ -698,7 +718,7 @@ buildvariants:
698718 ruby : ["ruby-2.7"]
699719 mongodb-version : " 4.0"
700720 topology : ['replica-set', 'sharded-cluster']
701- os : rhel80
721+ os : ubuntu-20.04
702722 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
703723 tasks :
704724 - name : " test"
@@ -707,16 +727,16 @@ buildvariants:
707727 matrix_spec :
708728 driver : [min]
709729 ruby : ["ruby-2.7"]
710- mongodb-version : " 3.6 "
730+ mongodb-version : " 4.4 "
711731 topology : " standalone"
712- os : rhel80
732+ os : ubuntu-20.04
713733 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
714734 tasks :
715735 - name : " test"
716736
717737- matrix_name : " rails-7"
718738 matrix_spec :
719- ruby : ["ruby-3.2 "]
739+ ruby : ["ruby-3.3 "]
720740 driver : ["current"]
721741 mongodb-version : " 6.0"
722742 topology : " standalone"
@@ -733,18 +753,18 @@ buildvariants:
733753 ruby : ["ruby-2.7"]
734754 mongodb-version : " 5.0"
735755 topology : " standalone"
736- os : rhel80
756+ os : ubuntu-20.04
737757 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
738758 tasks :
739759 - name : " test"
740760
741761- matrix_name : " bson-master"
742762 matrix_spec :
743763 driver : [bson-master]
744- ruby : ["ruby-3.0 "]
745- mongodb-version : " 5 .0"
764+ ruby : ["ruby-3.3 "]
765+ mongodb-version : " 7 .0"
746766 topology : " standalone"
747- os : rhel80
767+ os : ubuntu-22.04
748768 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
749769 tasks :
750770 - name : " test"
@@ -757,45 +777,45 @@ buildvariants:
757777 mongodb-version : " 6.0"
758778 topology : " standalone"
759779 rails : ['6.0', '6.1']
760- os : rhel80
780+ os : ubuntu-20.04
761781 display_name : " ${rails}, ${driver}, ${mongodb-version}"
762782 tasks :
763783 - name : " test"
764784
765785- matrix_name : " i18n-fallbacks"
766786 matrix_spec :
767- ruby : " ruby-2.7 "
787+ ruby : " ruby-3.0 "
768788 driver : ["current"]
769- mongodb-version : " 4.2 "
789+ mongodb-version : " 4.4 "
770790 topology : " standalone"
771791 test-i18n-fallbacks : yes
772- os : rhel80
792+ os : ubuntu-20.04
773793 display_name : " i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
774794 tasks :
775795 - name : " test"
776796
777797- matrix_name : app-tests-rails-7
778798 matrix_spec :
779- ruby : ["ruby-3.1", "ruby-3.2"]
799+ ruby : ["ruby-3.1", "ruby-3.2", "ruby-3.3" ]
780800 driver : ["current"]
781- mongodb-version : ' 6 .0'
801+ mongodb-version : ' 7 .0'
782802 topology : standalone
783803 app-tests : yes
784804 rails : ['6.1', '7.0', '7.1', '7.2']
785- os : ubuntu-20 .04
805+ os : ubuntu-22 .04
786806 display_name : " app tests ${driver}, ${ruby}, ${rails}"
787807 tasks :
788808 - name : " test"
789809
790810- matrix_name : app-tests-rails-6-0
791811 matrix_spec :
792- ruby : ["ruby-2.7 "]
812+ ruby : ["ruby-3.0 "]
793813 driver : ["current"]
794814 mongodb-version : ' 5.0'
795815 topology : standalone
796816 app-tests : yes
797817 rails : ['6.0']
798- os : rhel80
818+ os : ubuntu-20.04
799819 display_name : " app tests ${driver}, ${ruby}, ${rails}"
800820 tasks :
801821 - name : " test"
0 commit comments