summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2021-11-01 13:18:31 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-11-04 13:38:06 +0000
commit36468ab03f8a27498ce54862aadf5cc17957159a (patch)
tree6243cbc16e06c6afc3862fc9c3b6725423d36cc1
parent20549d58943b586749d1570eee834c71bdef1b37 (diff)
downloadmongo-36468ab03f8a27498ce54862aadf5cc17957159a.tar.gz
SERVER-61167 Update Xcode current builders to 13 and enable C++20
-rw-r--r--etc/evergreen.yml31
-rw-r--r--etc/generate_subtasks_config.yml1
2 files changed, 30 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 028f245f2d2..0fa9b60b8a0 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9076,7 +9076,7 @@ buildvariants:
- macos-1100-arm64
expansions:
test_flags: --excludeWithAnyTags=incompatible_with_macos
- compile_env: DEVELOPER_DIR=/Applications/Xcode12.4.app
+ compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --libc++ --link-model=dynamic --variables-files=etc/scons/xcode_macosx.vars
resmoke_jobs_max: 6
num_scons_link_jobs_available: 0.99
@@ -9094,6 +9094,33 @@ buildvariants:
- name: replica_sets_jscore_passthrough_gen
- name: sasl
+- name: enterprise-macos-rosetta-2-cxx20
+ display_name: "Enterprise macOS Via Rosetta 2 C++20 DEBUG"
+ cron: "0 12 * * *" # Every day starting at 12:00
+ modules:
+ - enterprise
+ run_on:
+ - macos-1100-arm64
+ expansions:
+ test_flags: --excludeWithAnyTags=incompatible_with_macos
+ compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
+ compile_flags: --ssl --dbg=on --opt=on -j$(sysctl -n hw.logicalcpu) --libc++ --link-model=dynamic --variables-files=etc/scons/xcode_macosx.vars --cxx-std=20
+ resmoke_jobs_max: 6
+ num_scons_link_jobs_available: 0.99
+ tasks:
+ - name: compile_test_and_package_serial_TG
+ - name: build_variant_gen
+ - name: audit
+ - name: auth_audit_gen
+ - name: causally_consistent_jscore_txns_passthrough
+ - name: .encrypt !.replica_sets !.sharding !.aggregation !.jscore !.ssl
+ - name: .jscore .common !.decimal !.sharding
+ - name: .logical_session_cache .one_sec
+ - name: mqlrun
+ - name: replica_sets_auth_gen
+ - name: replica_sets_jscore_passthrough_gen
+ - name: sasl
+
- name: enterprise-macos-arm64
display_name: "~ Enterprise macOS arm64 (--js-engine=none)"
modules:
@@ -9102,7 +9129,7 @@ buildvariants:
- macos-1100-arm64
expansions:
test_flags: --excludeWithAnyTags=incompatible_with_macos
- compile_env: DEVELOPER_DIR=/Applications/Xcode12.4.app
+ compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
compile_flags: --ssl --js-engine=none -j$(sysctl -n hw.logicalcpu) --link-model=dynamic --libc++ --variables-files=etc/scons/xcode_macosx_arm.vars
resmoke_jobs_max: 6
num_scons_link_jobs_available: 0.99
diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml
index e38fe5cf91f..df431d8541f 100644
--- a/etc/generate_subtasks_config.yml
+++ b/etc/generate_subtasks_config.yml
@@ -11,6 +11,7 @@ build_variant_large_distro_exceptions:
- enterprise-macos
- enterprise-macos-xcode-current
- enterprise-macos-rosetta-2
+ - enterprise-macos-rosetta-2-cxx20
- enterprise-macos-arm64
- enterprise-rhel-67-s390x
- enterprise-rhel-70-64-bit