Skip to content

Commit

Permalink
chore(ci): move to new macOS distros MONGOSH-1835 (#2161)
Browse files Browse the repository at this point in the history
  • Loading branch information
addaleax authored Sep 11, 2024
1 parent 87440d8 commit 6e71cb1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
14 changes: 7 additions & 7 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17204,7 +17204,7 @@ tasks:
buildvariants:
- name: darwin_unit
display_name: "MacOS Big Sur (Unit tests)"
run_on: macos-1100
run_on: macos-11
expansions:
executable_os_id: darwin-x64
tasks:
Expand Down Expand Up @@ -17375,7 +17375,7 @@ buildvariants:
- name: test_n16_types
- name: darwin
display_name: "MacOS Big Sur"
run_on: macos-1100
run_on: macos-11
expansions:
executable_os_id: darwin-x64
tasks:
Expand All @@ -17387,7 +17387,7 @@ buildvariants:
- name: sign_artifact_darwin_arm64
- name: darwin_arm64
display_name: "MacOS Big Sur (arm64)"
run_on: macos-1100-arm64
run_on: macos-11-arm64
expansions:
executable_os_id: darwin-arm64
tasks:
Expand Down Expand Up @@ -17689,7 +17689,7 @@ buildvariants:
- name: verify_artifact_win32msi_x64
- name: verify_mac_artifact
display_name: "MacOS (Signature Verification)"
run_on: macos-1100
run_on: macos-11
tasks:
- name: verify_artifact_darwin_arm64
- name: verify_artifact_darwin_x64
Expand Down Expand Up @@ -18285,17 +18285,17 @@ buildvariants:
- name: pkg_test_ssh_win32msi_x64
- name: pkg_smoke_tests_macos_1100_x64
display_name: "package smoke tests (macos 11.00 x64)"
run_on: macos-1100
run_on: macos-11
tasks:
- name: pkg_test_macos_darwin_x64
- name: pkg_smoke_tests_macos_1100_arm64
display_name: "package smoke tests (macos 11.00 arm64)"
run_on: macos-1100-arm64
run_on: macos-11-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_macos_1300_arm64
display_name: "package smoke tests (macos 13.00 arm64)"
run_on: macos-1300-arm64
run_on: macos-13-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_macos_1400_x64
Expand Down
8 changes: 4 additions & 4 deletions .evergreen/compilation-context-expansions.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ amazon2-arm64-large=true
amazon2-large=false
debian10-small=false
debian11-small=false
macos-1100=true
macos-1100-arm64=true
macos-1300-arm64=true
macos-11=true
macos-11-arm64=true
macos-13-arm64=true
rhel70-build=true
rhel70-large=true
rhel72-zseries-large=true
Expand Down Expand Up @@ -66,4 +66,4 @@ for TEST in $TEST_CASES ; do
fi
done

exit $EXIT_VAL
exit $EXIT_VAL
14 changes: 7 additions & 7 deletions .evergreen/evergreen.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -1494,7 +1494,7 @@ tasks:
buildvariants:
- name: darwin_unit
display_name: "MacOS Big Sur (Unit tests)"
run_on: macos-1100
run_on: macos-11
expansions:
executable_os_id: darwin-x64
tasks:
Expand All @@ -1504,7 +1504,7 @@ buildvariants:
<% } %>
- name: darwin
display_name: "MacOS Big Sur"
run_on: macos-1100
run_on: macos-11
expansions:
executable_os_id: darwin-x64
tasks:
Expand All @@ -1516,7 +1516,7 @@ buildvariants:
- name: sign_artifact_darwin_arm64
- name: darwin_arm64
display_name: "MacOS Big Sur (arm64)"
run_on: macos-1100-arm64
run_on: macos-11-arm64
expansions:
executable_os_id: darwin-arm64
tasks:
Expand Down Expand Up @@ -1577,7 +1577,7 @@ buildvariants:
- name: verify_artifact_win32msi_x64
- name: verify_mac_artifact
display_name: "MacOS (Signature Verification)"
run_on: macos-1100
run_on: macos-11
tasks:
- name: verify_artifact_darwin_arm64
- name: verify_artifact_darwin_x64
Expand Down Expand Up @@ -1945,17 +1945,17 @@ buildvariants:
- name: pkg_test_ssh_win32msi_x64
- name: pkg_smoke_tests_macos_1100_x64
display_name: "package smoke tests (macos 11.00 x64)"
run_on: macos-1100
run_on: macos-11
tasks:
- name: pkg_test_macos_darwin_x64
- name: pkg_smoke_tests_macos_1100_arm64
display_name: "package smoke tests (macos 11.00 arm64)"
run_on: macos-1100-arm64
run_on: macos-11-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_macos_1300_arm64
display_name: "package smoke tests (macos 13.00 arm64)"
run_on: macos-1300-arm64
run_on: macos-13-arm64
tasks:
- name: pkg_test_macos_darwin_arm64
- name: pkg_smoke_tests_macos_1400_x64
Expand Down

0 comments on commit 6e71cb1

Please sign in to comment.