Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eramongodb merged 4 commits into from
Dec 4, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8694d7a
Migrate from macos-1100 to macos-14-arm64
eramongodb Dec 3, 2024
9246f48
Restore MacOS 11 test coverage on arm64 distros
eramongodb Dec 3, 2024
4841b6f
CXX-3193 Add deprecation notice for MacOS 11 and MacOS 12
eramongodb Dec 3, 2024
bea5361
Revert to macos-1100
eramongodb Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .evergreen/config_generator/components/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
('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-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']),
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config_generator/components/versioned_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]),
]
Expand Down
4 changes: 2 additions & 2 deletions .evergreen/config_generator/etc/distros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ 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-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'),
]

RHEL_DISTROS = [
Expand Down
104 changes: 52 additions & 52 deletions .evergreen/generated_configs/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,9 @@ tasks:
vars:
MONGOCXX_TEST_TOPOLOGY: single
USE_STATIC_LIBS: 1
- name: integration-macos-1100-release-shared-5.0-single
run_on: macos-1100
tags: [integration, macos-1100, release, shared, "5.0", single]
- 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:
Expand All @@ -703,20 +703,23 @@ tasks:
- func: setup
- func: start_mongod
vars:
mongodb_version: "5.0"
- func: fetch_c_driver_source
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"
RUN_DISTCHECK: 1
- func: fetch-det
- func: run_kms_servers
- func: test
vars:
MONGOCXX_TEST_TOPOLOGY: single
- name: integration-macos-1100-release-shared-extra_alignment-5.0-single
run_on: macos-1100
tags: [integration, macos-1100, release, shared, extra_alignment, "5.0", 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:
Expand All @@ -725,23 +728,20 @@ tasks:
- func: setup
- func: start_mongod
vars:
mongodb_version: "5.0"
- func: install_c_driver
vars:
BSON_EXTRA_ALIGNMENT: 1
SKIP_INSTALL_LIBMONGOCRYPT: 1
mongodb_version: latest
- func: fetch_c_driver_source
- func: compile
vars:
BSON_EXTRA_ALIGNMENT: 1
ENABLE_TESTS: "ON"
RUN_DISTCHECK: 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
run_on: macos-1100
tags: [integration, macos-1100, release, shared, extra_alignment, latest, 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:
Expand All @@ -759,14 +759,16 @@ 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-latest-single
run_on: macos-1100
tags: [integration, macos-1100, release, shared, latest, 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:
Expand All @@ -781,14 +783,16 @@ tasks:
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
- name: integration-macos-1100-release-static-5.0-single
run_on: macos-1100
tags: [integration, macos-1100, release, static, "5.0", single]
USE_STATIC_LIBS: 1
- 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:
Expand All @@ -803,16 +807,14 @@ tasks:
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-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-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:
Expand All @@ -830,16 +832,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-extra_alignment-latest-single
run_on: macos-1100
tags: [integration, macos-1100, release, static, extra_alignment, 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:
Expand All @@ -848,25 +848,22 @@ tasks:
- func: setup
- func: start_mongod
vars:
mongodb_version: latest
- func: install_c_driver
vars:
BSON_EXTRA_ALIGNMENT: 1
SKIP_INSTALL_LIBMONGOCRYPT: 1
mongodb_version: "5.0"
- func: fetch_c_driver_source
- func: compile
vars:
BSON_EXTRA_ALIGNMENT: 1
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-1100-release-static-latest-single
run_on: macos-1100
tags: [integration, macos-1100, release, static, latest, single]
- 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:
Expand All @@ -875,12 +872,15 @@ tasks:
- func: setup
- func: start_mongod
vars:
mongodb_version: latest
- func: fetch_c_driver_source
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"
RUN_DISTCHECK: 1
USE_STATIC_LIBS: 1
- func: fetch-det
- func: run_kms_servers
Expand Down Expand Up @@ -4537,9 +4537,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
Expand Down Expand Up @@ -4608,9 +4608,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
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/scripts/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ cygwin)
;;
darwin*)
cc_flags+=("${cc_flags_init[@]}")
cxx_flags+=("${cxx_flags_init[@]}" -stdlib=libc++)
cxx_flags+=("${cxx_flags_init[@]}" -stdlib=libc++ -Wno-align-mismatch)
;;
linux*)
cc_flags+=("${cc_flags_init[@]}")
Expand Down