CXX-3194 Migrate from macos-1100 to macos-14-arm64

.evergreen/config_generator/components/integration.py

@@ -34,7 +34,10 @@
     ('debian12', None, ['Release'], ['shared',         ], [      20], [None], ['plain',        ], [False, True], ['latest'], ['single',                     ]),
     ('debian12', None, ['Release'], ['shared',         ], [None,   ], [None], [         'csfle'], [False,     ], ['latest'], [          'replica', 'sharded']),
 
-    ('macos-1100', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
+    ('macos-1100', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['latest'], ['single']),
+
+    ('macos-14',       None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0',         ], ['single']),
+    ('macos-14-arm64', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], [       'latest'], ['single']),
 
     ('rhel81-power8',  None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0',        'latest'], ['single']),
     ('rhel83-zseries', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', '6.0', 'latest'], ['single']),

.evergreen/config_generator/components/versioned_api.py

@@ -20,7 +20,7 @@
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ('macos-1100',        None,        ['Release'], ['shared'], [None]),
+    ('macos-14-arm64',    None,        ['Release'], ['shared'], [None]),
     ('ubuntu2004',        None,        ['Debug'  ], ['shared'], [None]),
     ('windows-vsCurrent', 'vs2019x64', ['Debug'  ], ['shared'], [None]),
 ]

.evergreen/config_generator/etc/distros.py

@@ -58,10 +58,12 @@ def validate_os_ver(cls, value):
 
 MACOS_DISTROS = [
     Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'),
+    Distro(name='macos-14', os='macos', os_type='macos', os_ver='14'),
 ]
 
 MACOS_ARM64_DISTROS = [
-    Distro(name='macos-1100-arm64', os='macos', os_type='macos', os_ver='11.00', arch='arm64'),
+    Distro(name='macos-11-arm64', os='macos', os_type='macos', os_ver='11', arch='arm64'),
+    Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'),
 ]
 
 RHEL_DISTROS = [

.evergreen/generated_configs/tasks.yml

@@ -692,9 +692,9 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
           USE_STATIC_LIBS: 1
-  - name: integration-macos-1100-release-shared-5.0-single
+  - name: integration-macos-1100-release-shared-extra_alignment-latest-single
     run_on: macos-1100
-    tags: [integration, macos-1100, release, shared, "5.0", single]
+    tags: [integration, macos-1100, release, shared, extra_alignment, latest, single]
     commands:
       - command: expansions.update
         params:
@@ -703,7 +703,32 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "5.0"
+          mongodb_version: latest
+      - func: install_c_driver
+        vars:
+          BSON_EXTRA_ALIGNMENT: 1
+          SKIP_INSTALL_LIBMONGOCRYPT: 1
+      - func: compile
+        vars:
+          BSON_EXTRA_ALIGNMENT: 1
+          ENABLE_TESTS: "ON"
+      - func: fetch-det
+      - func: run_kms_servers
+      - func: test
+        vars:
+          MONGOCXX_TEST_TOPOLOGY: single
+  - name: integration-macos-1100-release-shared-latest-single
+    run_on: macos-1100
+    tags: [integration, macos-1100, release, shared, latest, single]
+    commands:
+      - command: expansions.update
+        params:
+          updates:
+            - { key: build_type, value: Release }
+      - func: setup
+      - func: start_mongod
+        vars:
+          mongodb_version: latest
       - func: fetch_c_driver_source
       - func: compile
         vars:
@@ -714,9 +739,9 @@ tasks:
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-  - name: integration-macos-1100-release-shared-extra_alignment-5.0-single
+  - name: integration-macos-1100-release-static-extra_alignment-latest-single
     run_on: macos-1100
-    tags: [integration, macos-1100, release, shared, extra_alignment, "5.0", single]
+    tags: [integration, macos-1100, release, static, extra_alignment, latest, single]
     commands:
       - command: expansions.update
         params:
@@ -725,7 +750,7 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "5.0"
+          mongodb_version: latest
       - func: install_c_driver
         vars:
           BSON_EXTRA_ALIGNMENT: 1
@@ -734,14 +759,40 @@ tasks:
         vars:
           BSON_EXTRA_ALIGNMENT: 1
           ENABLE_TESTS: "ON"
+          USE_STATIC_LIBS: 1
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-  - name: integration-macos-1100-release-shared-extra_alignment-latest-single
+          USE_STATIC_LIBS: 1
+  - name: integration-macos-1100-release-static-latest-single
     run_on: macos-1100
-    tags: [integration, macos-1100, release, shared, extra_alignment, latest, single]
+    tags: [integration, macos-1100, release, static, latest, single]
+    commands:
+      - command: expansions.update
+        params:
+          updates:
+            - { key: build_type, value: Release }
+      - func: setup
+      - func: start_mongod
+        vars:
+          mongodb_version: latest
+      - func: fetch_c_driver_source
+      - func: compile
+        vars:
+          ENABLE_TESTS: "ON"
+          RUN_DISTCHECK: 1
+          USE_STATIC_LIBS: 1
+      - func: fetch-det
+      - func: run_kms_servers
+      - func: test
+        vars:
+          MONGOCXX_TEST_TOPOLOGY: single
+          USE_STATIC_LIBS: 1
+  - name: integration-macos-14-arm64-release-shared-extra_alignment-latest-single
+    run_on: macos-14-arm64
+    tags: [integration, macos-14-arm64, release, shared, extra_alignment, latest, single]
     commands:
       - command: expansions.update
         params:
@@ -764,9 +815,9 @@ tasks:
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-  - name: integration-macos-1100-release-shared-latest-single
-    run_on: macos-1100
-    tags: [integration, macos-1100, release, shared, latest, single]
+  - name: integration-macos-14-arm64-release-shared-latest-single
+    run_on: macos-14-arm64
+    tags: [integration, macos-14-arm64, release, shared, latest, single]
     commands:
       - command: expansions.update
         params:
@@ -786,9 +837,9 @@ tasks:
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-  - name: integration-macos-1100-release-static-5.0-single
-    run_on: macos-1100
-    tags: [integration, macos-1100, release, static, "5.0", single]
+  - name: integration-macos-14-arm64-release-static-extra_alignment-latest-single
+    run_on: macos-14-arm64
+    tags: [integration, macos-14-arm64, release, static, extra_alignment, latest, single]
     commands:
       - command: expansions.update
         params:
@@ -797,7 +848,34 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "5.0"
+          mongodb_version: latest
+      - func: install_c_driver
+        vars:
+          BSON_EXTRA_ALIGNMENT: 1
+          SKIP_INSTALL_LIBMONGOCRYPT: 1
+      - func: compile
+        vars:
+          BSON_EXTRA_ALIGNMENT: 1
+          ENABLE_TESTS: "ON"
+          USE_STATIC_LIBS: 1
+      - func: fetch-det
+      - func: run_kms_servers
+      - func: test
+        vars:
+          MONGOCXX_TEST_TOPOLOGY: single
+          USE_STATIC_LIBS: 1
+  - name: integration-macos-14-arm64-release-static-latest-single
+    run_on: macos-14-arm64
+    tags: [integration, macos-14-arm64, release, static, latest, single]
+    commands:
+      - command: expansions.update
+        params:
+          updates:
+            - { key: build_type, value: Release }
+      - func: setup
+      - func: start_mongod
+        vars:
+          mongodb_version: latest
       - func: fetch_c_driver_source
       - func: compile
         vars:
@@ -810,9 +888,9 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
           USE_STATIC_LIBS: 1
-  - name: integration-macos-1100-release-static-extra_alignment-5.0-single
-    run_on: macos-1100
-    tags: [integration, macos-1100, release, static, extra_alignment, "5.0", single]
+  - name: integration-macos-14-release-shared-5.0-single
+    run_on: macos-14
+    tags: [integration, macos-14, release, shared, "5.0", single]
     commands:
       - command: expansions.update
         params:
@@ -822,24 +900,19 @@ tasks:
       - func: start_mongod
         vars:
           mongodb_version: "5.0"
-      - func: install_c_driver
-        vars:
-          BSON_EXTRA_ALIGNMENT: 1
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
+      - func: fetch_c_driver_source
       - func: compile
         vars:
-          BSON_EXTRA_ALIGNMENT: 1
           ENABLE_TESTS: "ON"
-          USE_STATIC_LIBS: 1
+          RUN_DISTCHECK: 1
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-          USE_STATIC_LIBS: 1
-  - name: integration-macos-1100-release-static-extra_alignment-latest-single
-    run_on: macos-1100
-    tags: [integration, macos-1100, release, static, extra_alignment, latest, single]
+  - name: integration-macos-14-release-shared-extra_alignment-5.0-single
+    run_on: macos-14
+    tags: [integration, macos-14, release, shared, extra_alignment, "5.0", single]
     commands:
       - command: expansions.update
         params:
@@ -848,7 +921,7 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: latest
+          mongodb_version: "5.0"
       - func: install_c_driver
         vars:
           BSON_EXTRA_ALIGNMENT: 1
@@ -857,16 +930,14 @@ tasks:
         vars:
           BSON_EXTRA_ALIGNMENT: 1
           ENABLE_TESTS: "ON"
-          USE_STATIC_LIBS: 1
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-          USE_STATIC_LIBS: 1
-  - name: integration-macos-1100-release-static-latest-single
-    run_on: macos-1100
-    tags: [integration, macos-1100, release, static, latest, single]
+  - name: integration-macos-14-release-static-5.0-single
+    run_on: macos-14
+    tags: [integration, macos-14, release, static, "5.0", single]
     commands:
       - command: expansions.update
         params:
@@ -875,7 +946,7 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: latest
+          mongodb_version: "5.0"
       - func: fetch_c_driver_source
       - func: compile
         vars:
@@ -888,6 +959,33 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
           USE_STATIC_LIBS: 1
+  - name: integration-macos-14-release-static-extra_alignment-5.0-single
+    run_on: macos-14
+    tags: [integration, macos-14, release, static, extra_alignment, "5.0", single]
+    commands:
+      - command: expansions.update
+        params:
+          updates:
+            - { key: build_type, value: Release }
+      - func: setup
+      - func: start_mongod
+        vars:
+          mongodb_version: "5.0"
+      - func: install_c_driver
+        vars:
+          BSON_EXTRA_ALIGNMENT: 1
+          SKIP_INSTALL_LIBMONGOCRYPT: 1
+      - func: compile
+        vars:
+          BSON_EXTRA_ALIGNMENT: 1
+          ENABLE_TESTS: "ON"
+          USE_STATIC_LIBS: 1
+      - func: fetch-det
+      - func: run_kms_servers
+      - func: test
+        vars:
+          MONGOCXX_TEST_TOPOLOGY: single
+          USE_STATIC_LIBS: 1
   - name: integration-rhel81-power8-release-shared-5.0-single
     run_on: rhel81-power8-large
     tags: [integration, rhel81-power8, release, shared, "5.0", single]
@@ -4537,9 +4635,9 @@ tasks:
           TEST_WITH_VALGRIND: "ON"
           disable_slow_tests: 1
           use_mongocryptd: true
-  - name: versioned-api-one-required-macos-1100-release-shared
-    run_on: macos-1100
-    tags: [versioned-api, macos-1100, release, shared]
+  - name: versioned-api-one-required-macos-14-arm64-release-shared
+    run_on: macos-14-arm64
+    tags: [versioned-api, macos-14-arm64, release, shared]
     commands:
       - func: setup
       - func: start_mongod
@@ -4608,9 +4706,9 @@ tasks:
           example_projects_cxx_standard: 17
           generator: Visual Studio 16 2019
           platform: x64
-  - name: versioned-api-two-accepted-macos-1100-release-shared
-    run_on: macos-1100
-    tags: [versioned-api, macos-1100, release, shared]
+  - name: versioned-api-two-accepted-macos-14-arm64-release-shared
+    run_on: macos-14-arm64
+    tags: [versioned-api, macos-14-arm64, release, shared]
     commands:
       - func: setup
       - func: start_mongod

.evergreen/scripts/compile.sh

@@ -146,6 +146,10 @@ cygwin)
 darwin*)
   cc_flags+=("${cc_flags_init[@]}")
   cxx_flags+=("${cxx_flags_init[@]}" -stdlib=libc++)
+
+  if [[ "${distro_id:?}" == macos-14* ]]; then
+    cxx_flags+=(-Wno-align-mismatch)
+  fi
   ;;
 linux*)
   cc_flags+=("${cc_flags_init[@]}")

CHANGELOG.md

@@ -9,7 +9,9 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
 
 ## 4.1.0 [Unreleased]
 
-<!-- Will contain entries for the next minor release. -->
+### Deprecated
+
+- Support for MacOS 11 (EOL since Nov 2020) and MacOS 12 (EOL since Oct 2021).
 
 ## 4.0.0