File tree Expand file tree Collapse file tree 1 file changed +23
-8
lines changed
Expand file tree Collapse file tree 1 file changed +23
-8
lines changed Original file line number Diff line number Diff line change @@ -1177,17 +1177,16 @@ buildvariants:
11771177 - " .3.0"
11781178 - " .2.6"
11791179
1180- - matrix_name : " tests-nossl "
1180+ - matrix_name : " tests-archlinux "
11811181 matrix_spec :
11821182 platform :
1183- # OSes that support versions of MongoDB without SSL.
1183+ # Archlinux supports MongoDB without SSL.
1184+ # MongoDB 4.2 drops support for archlinux (generic linux builds).
11841185 - archlinux-test
1185- - macos-1012
11861186 auth : " *"
11871187 ssl : " nossl"
11881188 display_name : " ${platform} ${auth} ${ssl}"
11891189 tasks :
1190- - " .latest"
11911190 - " .4.0"
11921191 - " .3.6"
11931192 - " .3.4"
@@ -1212,20 +1211,36 @@ buildvariants:
12121211 - " .3.4"
12131212 - " .3.2"
12141213
1215- - matrix_name : " tests-ssl-requires-32 "
1214+ - matrix_name : " test-macos "
12161215 matrix_spec :
12171216 platform :
1218- # OSes that introduced support for SSL with MongoDB>=3.2.
1217+ # MacOS introduced SSL support with MongoDB >= 3.2.
1218+ # Older server versions (2.6, 3.0) are supported without SSL.
12191219 - macos-1012
1220- auth-ssl : " auth-ssl"
1221- display_name : " ${platform} ${auth-ssl}"
1220+ auth : " *"
1221+ ssl : " *"
1222+ exclude_spec :
1223+ # No point testing with SSL without auth.
1224+ - platform : macos-1012
1225+ auth : " noauth"
1226+ ssl : " ssl"
1227+ display_name : " ${platform} ${auth} ${ssl}"
12221228 tasks :
12231229 - " .latest"
12241230 - " .4.2"
12251231 - " .4.0"
12261232 - " .3.6"
12271233 - " .3.4"
12281234 - " .3.2"
1235+ rules :
1236+ - if :
1237+ platform : macos-1012
1238+ auth : " *"
1239+ ssl : " nossl"
1240+ then :
1241+ add_tasks :
1242+ - " .3.0"
1243+ - " .2.6"
12291244
12301245- matrix_name : " test-os-requires-34-no-42plus"
12311246 matrix_spec :
You can’t perform that action at this time.
0 commit comments