Skip to content

Commit c609e3e

Browse files
eramongodberamongodb
authored
CXX-3194 Migrate from macos-1100 to macos-14-arm64 (#1293)
* CXX-3193 Add deprecation notice for MacOS 11 and MacOS 12
1 parent e558290 commit c609e3e

File tree

6 files changed

+154
-45
lines changed

6 files changed

+154
-45
lines changed

‎.evergreen/config_generator/components/integration.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
('debian12', None, ['Release'], ['shared', ], [ 20], [None], ['plain', ], [False, True], ['latest'], ['single', ]),
3535
('debian12', None, ['Release'], ['shared', ], [None, ], [None], [ 'csfle'], [False, ], ['latest'], [ 'replica', 'sharded']),
3636

37-
('macos-1100', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
37+
('macos-1100', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['latest'], ['single']),
38+
39+
('macos-14', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', ], ['single']),
40+
('macos-14-arm64', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], [ 'latest'], ['single']),
3841

3942
('rhel81-power8', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
4043
('rhel83-zseries', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', '6.0', 'latest'], ['single']),

‎.evergreen/config_generator/components/versioned_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# pylint: disable=line-too-long
2121
# fmt: off
2222
MATRIX = [
23-
('macos-1100', None, ['Release'], ['shared'], [None]),
23+
('macos-14-arm64', None, ['Release'], ['shared'], [None]),
2424
('ubuntu2004', None, ['Debug' ], ['shared'], [None]),
2525
('windows-vsCurrent', 'vs2019x64', ['Debug' ], ['shared'], [None]),
2626
]

‎.evergreen/config_generator/etc/distros.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ def validate_os_ver(cls, value):
5858

5959
MACOS_DISTROS = [
6060
Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'),
61+
Distro(name='macos-14', os='macos', os_type='macos', os_ver='14'),
6162
]
6263

6364
MACOS_ARM64_DISTROS = [
64-
Distro(name='macos-1100-arm64', os='macos', os_type='macos', os_ver='11.00', arch='arm64'),
65+
Distro(name='macos-11-arm64', os='macos', os_type='macos', os_ver='11', arch='arm64'),
66+
Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'),
6567
]
6668

6769
RHEL_DISTROS = [

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 139 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -692,9 +692,9 @@ tasks:
692692
vars:
693693
MONGOCXX_TEST_TOPOLOGY: single
694694
USE_STATIC_LIBS: 1
695-
- name: integration-macos-1100-release-shared-5.0-single
695+
- name: integration-macos-1100-release-shared-extra_alignment-latest-single
696696
run_on: macos-1100
697-
tags: [integration, macos-1100, release, shared, "5.0", single]
697+
tags: [integration, macos-1100, release, shared, extra_alignment, latest, single]
698698
commands:
699699
- command: expansions.update
700700
params:
@@ -703,7 +703,32 @@ tasks:
703703
- func: setup
704704
- func: start_mongod
705705
vars:
706-
mongodb_version: "5.0"
706+
mongodb_version: latest
707+
- func: install_c_driver
708+
vars:
709+
BSON_EXTRA_ALIGNMENT: 1
710+
SKIP_INSTALL_LIBMONGOCRYPT: 1
711+
- func: compile
712+
vars:
713+
BSON_EXTRA_ALIGNMENT: 1
714+
ENABLE_TESTS: "ON"
715+
- func: fetch-det
716+
- func: run_kms_servers
717+
- func: test
718+
vars:
719+
MONGOCXX_TEST_TOPOLOGY: single
720+
- name: integration-macos-1100-release-shared-latest-single
721+
run_on: macos-1100
722+
tags: [integration, macos-1100, release, shared, latest, single]
723+
commands:
724+
- command: expansions.update
725+
params:
726+
updates:
727+
- { key: build_type, value: Release }
728+
- func: setup
729+
- func: start_mongod
730+
vars:
731+
mongodb_version: latest
707732
- func: fetch_c_driver_source
708733
- func: compile
709734
vars:
@@ -714,9 +739,9 @@ tasks:
714739
- func: test
715740
vars:
716741
MONGOCXX_TEST_TOPOLOGY: single
717-
- name: integration-macos-1100-release-shared-extra_alignment-5.0-single
742+
- name: integration-macos-1100-release-static-extra_alignment-latest-single
718743
run_on: macos-1100
719-
tags: [integration, macos-1100, release, shared, extra_alignment, "5.0", single]
744+
tags: [integration, macos-1100, release, static, extra_alignment, latest, single]
720745
commands:
721746
- command: expansions.update
722747
params:
@@ -725,7 +750,7 @@ tasks:
725750
- func: setup
726751
- func: start_mongod
727752
vars:
728-
mongodb_version: "5.0"
753+
mongodb_version: latest
729754
- func: install_c_driver
730755
vars:
731756
BSON_EXTRA_ALIGNMENT: 1
@@ -734,14 +759,40 @@ tasks:
734759
vars:
735760
BSON_EXTRA_ALIGNMENT: 1
736761
ENABLE_TESTS: "ON"
762+
USE_STATIC_LIBS: 1
737763
- func: fetch-det
738764
- func: run_kms_servers
739765
- func: test
740766
vars:
741767
MONGOCXX_TEST_TOPOLOGY: single
742-
- name: integration-macos-1100-release-shared-extra_alignment-latest-single
768+
USE_STATIC_LIBS: 1
769+
- name: integration-macos-1100-release-static-latest-single
743770
run_on: macos-1100
744-
tags: [integration, macos-1100, release, shared, extra_alignment, latest, single]
771+
tags: [integration, macos-1100, release, static, latest, single]
772+
commands:
773+
- command: expansions.update
774+
params:
775+
updates:
776+
- { key: build_type, value: Release }
777+
- func: setup
778+
- func: start_mongod
779+
vars:
780+
mongodb_version: latest
781+
- func: fetch_c_driver_source
782+
- func: compile
783+
vars:
784+
ENABLE_TESTS: "ON"
785+
RUN_DISTCHECK: 1
786+
USE_STATIC_LIBS: 1
787+
- func: fetch-det
788+
- func: run_kms_servers
789+
- func: test
790+
vars:
791+
MONGOCXX_TEST_TOPOLOGY: single
792+
USE_STATIC_LIBS: 1
793+
- name: integration-macos-14-arm64-release-shared-extra_alignment-latest-single
794+
run_on: macos-14-arm64
795+
tags: [integration, macos-14-arm64, release, shared, extra_alignment, latest, single]
745796
commands:
746797
- command: expansions.update
747798
params:
@@ -764,9 +815,9 @@ tasks:
764815
- func: test
765816
vars:
766817
MONGOCXX_TEST_TOPOLOGY: single
767-
- name: integration-macos-1100-release-shared-latest-single
768-
run_on: macos-1100
769-
tags: [integration, macos-1100, release, shared, latest, single]
818+
- name: integration-macos-14-arm64-release-shared-latest-single
819+
run_on: macos-14-arm64
820+
tags: [integration, macos-14-arm64, release, shared, latest, single]
770821
commands:
771822
- command: expansions.update
772823
params:
@@ -786,9 +837,9 @@ tasks:
786837
- func: test
787838
vars:
788839
MONGOCXX_TEST_TOPOLOGY: single
789-
- name: integration-macos-1100-release-static-5.0-single
790-
run_on: macos-1100
791-
tags: [integration, macos-1100, release, static, "5.0", single]
840+
- name: integration-macos-14-arm64-release-static-extra_alignment-latest-single
841+
run_on: macos-14-arm64
842+
tags: [integration, macos-14-arm64, release, static, extra_alignment, latest, single]
792843
commands:
793844
- command: expansions.update
794845
params:
@@ -797,7 +848,34 @@ tasks:
797848
- func: setup
798849
- func: start_mongod
799850
vars:
800-
mongodb_version: "5.0"
851+
mongodb_version: latest
852+
- func: install_c_driver
853+
vars:
854+
BSON_EXTRA_ALIGNMENT: 1
855+
SKIP_INSTALL_LIBMONGOCRYPT: 1
856+
- func: compile
857+
vars:
858+
BSON_EXTRA_ALIGNMENT: 1
859+
ENABLE_TESTS: "ON"
860+
USE_STATIC_LIBS: 1
861+
- func: fetch-det
862+
- func: run_kms_servers
863+
- func: test
864+
vars:
865+
MONGOCXX_TEST_TOPOLOGY: single
866+
USE_STATIC_LIBS: 1
867+
- name: integration-macos-14-arm64-release-static-latest-single
868+
run_on: macos-14-arm64
869+
tags: [integration, macos-14-arm64, release, static, latest, single]
870+
commands:
871+
- command: expansions.update
872+
params:
873+
updates:
874+
- { key: build_type, value: Release }
875+
- func: setup
876+
- func: start_mongod
877+
vars:
878+
mongodb_version: latest
801879
- func: fetch_c_driver_source
802880
- func: compile
803881
vars:
@@ -810,9 +888,9 @@ tasks:
810888
vars:
811889
MONGOCXX_TEST_TOPOLOGY: single
812890
USE_STATIC_LIBS: 1
813-
- name: integration-macos-1100-release-static-extra_alignment-5.0-single
814-
run_on: macos-1100
815-
tags: [integration, macos-1100, release, static, extra_alignment, "5.0", single]
891+
- name: integration-macos-14-release-shared-5.0-single
892+
run_on: macos-14
893+
tags: [integration, macos-14, release, shared, "5.0", single]
816894
commands:
817895
- command: expansions.update
818896
params:
@@ -822,24 +900,19 @@ tasks:
822900
- func: start_mongod
823901
vars:
824902
mongodb_version: "5.0"
825-
- func: install_c_driver
826-
vars:
827-
BSON_EXTRA_ALIGNMENT: 1
828-
SKIP_INSTALL_LIBMONGOCRYPT: 1
903+
- func: fetch_c_driver_source
829904
- func: compile
830905
vars:
831-
BSON_EXTRA_ALIGNMENT: 1
832906
ENABLE_TESTS: "ON"
833-
USE_STATIC_LIBS: 1
907+
RUN_DISTCHECK: 1
834908
- func: fetch-det
835909
- func: run_kms_servers
836910
- func: test
837911
vars:
838912
MONGOCXX_TEST_TOPOLOGY: single
839-
USE_STATIC_LIBS: 1
840-
- name: integration-macos-1100-release-static-extra_alignment-latest-single
841-
run_on: macos-1100
842-
tags: [integration, macos-1100, release, static, extra_alignment, latest, single]
913+
- name: integration-macos-14-release-shared-extra_alignment-5.0-single
914+
run_on: macos-14
915+
tags: [integration, macos-14, release, shared, extra_alignment, "5.0", single]
843916
commands:
844917
- command: expansions.update
845918
params:
@@ -848,7 +921,7 @@ tasks:
848921
- func: setup
849922
- func: start_mongod
850923
vars:
851-
mongodb_version: latest
924+
mongodb_version: "5.0"
852925
- func: install_c_driver
853926
vars:
854927
BSON_EXTRA_ALIGNMENT: 1
@@ -857,16 +930,14 @@ tasks:
857930
vars:
858931
BSON_EXTRA_ALIGNMENT: 1
859932
ENABLE_TESTS: "ON"
860-
USE_STATIC_LIBS: 1
861933
- func: fetch-det
862934
- func: run_kms_servers
863935
- func: test
864936
vars:
865937
MONGOCXX_TEST_TOPOLOGY: single
866-
USE_STATIC_LIBS: 1
867-
- name: integration-macos-1100-release-static-latest-single
868-
run_on: macos-1100
869-
tags: [integration, macos-1100, release, static, latest, single]
938+
- name: integration-macos-14-release-static-5.0-single
939+
run_on: macos-14
940+
tags: [integration, macos-14, release, static, "5.0", single]
870941
commands:
871942
- command: expansions.update
872943
params:
@@ -875,7 +946,7 @@ tasks:
875946
- func: setup
876947
- func: start_mongod
877948
vars:
878-
mongodb_version: latest
949+
mongodb_version: "5.0"
879950
- func: fetch_c_driver_source
880951
- func: compile
881952
vars:
@@ -888,6 +959,33 @@ tasks:
888959
vars:
889960
MONGOCXX_TEST_TOPOLOGY: single
890961
USE_STATIC_LIBS: 1
962+
- name: integration-macos-14-release-static-extra_alignment-5.0-single
963+
run_on: macos-14
964+
tags: [integration, macos-14, release, static, extra_alignment, "5.0", single]
965+
commands:
966+
- command: expansions.update
967+
params:
968+
updates:
969+
- { key: build_type, value: Release }
970+
- func: setup
971+
- func: start_mongod
972+
vars:
973+
mongodb_version: "5.0"
974+
- func: install_c_driver
975+
vars:
976+
BSON_EXTRA_ALIGNMENT: 1
977+
SKIP_INSTALL_LIBMONGOCRYPT: 1
978+
- func: compile
979+
vars:
980+
BSON_EXTRA_ALIGNMENT: 1
981+
ENABLE_TESTS: "ON"
982+
USE_STATIC_LIBS: 1
983+
- func: fetch-det
984+
- func: run_kms_servers
985+
- func: test
986+
vars:
987+
MONGOCXX_TEST_TOPOLOGY: single
988+
USE_STATIC_LIBS: 1
891989
- name: integration-rhel81-power8-release-shared-5.0-single
892990
run_on: rhel81-power8-large
893991
tags: [integration, rhel81-power8, release, shared, "5.0", single]
@@ -4537,9 +4635,9 @@ tasks:
45374635
TEST_WITH_VALGRIND: "ON"
45384636
disable_slow_tests: 1
45394637
use_mongocryptd: true
4540-
- name: versioned-api-one-required-macos-1100-release-shared
4541-
run_on: macos-1100
4542-
tags: [versioned-api, macos-1100, release, shared]
4638+
- name: versioned-api-one-required-macos-14-arm64-release-shared
4639+
run_on: macos-14-arm64
4640+
tags: [versioned-api, macos-14-arm64, release, shared]
45434641
commands:
45444642
- func: setup
45454643
- func: start_mongod
@@ -4608,9 +4706,9 @@ tasks:
46084706
example_projects_cxx_standard: 17
46094707
generator: Visual Studio 16 2019
46104708
platform: x64
4611-
- name: versioned-api-two-accepted-macos-1100-release-shared
4612-
run_on: macos-1100
4613-
tags: [versioned-api, macos-1100, release, shared]
4709+
- name: versioned-api-two-accepted-macos-14-arm64-release-shared
4710+
run_on: macos-14-arm64
4711+
tags: [versioned-api, macos-14-arm64, release, shared]
46144712
commands:
46154713
- func: setup
46164714
- func: start_mongod

‎.evergreen/scripts/compile.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ cygwin)
146146
darwin*)
147147
cc_flags+=("${cc_flags_init[@]}")
148148
cxx_flags+=("${cxx_flags_init[@]}" -stdlib=libc++)
149+
150+
if [[ "${distro_id:?}" == macos-14* ]]; then
151+
cxx_flags+=(-Wno-align-mismatch)
152+
fi
149153
;;
150154
linux*)
151155
cc_flags+=("${cc_flags_init[@]}")

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
99

1010
## 4.1.0 [Unreleased]
1111

12-
<!-- Will contain entries for the next minor release. -->
12+
### Deprecated
13+
14+
- Support for MacOS 11 (EOL since Nov 2020) and MacOS 12 (EOL since Oct 2021).
1315

1416
## 4.0.0
1517

0 commit comments

Comments
 (0)