Skip to content

CDRIVER-4580 Move compile-test coverage from macos-1014 to macos-1100 #1208

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.

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
merged 7 commits into from
Feb 22, 2023

Conversation

eramongodb
Copy link
Contributor

@eramongodb eramongodb commented Feb 16, 2023

This PR resolves CDRIVER-4580 and CDRIVER-3483. Verified by this patch.

Compile tasks were added/left-in for macos-1014 and macos-1015 in the sasl.darwinssl.COMPILE_MATRIX as the C Driver still documents their support. However, macos-1015 compile is disabled due to MONGOCRYPT-443 (assumed to be related due to absence of <Security/Security.h> required by mongoc-stream-tls-secure-transport-private.h). These compile tasks may be removed if preferable.

These changes only apply to components defined by the new config generator. Most tasks defined by the legacy config generator still use macos-1014 (i.e. several link-with-* tasks and some tasks in the OCSP and Darwin variants). These may also be updated to use macos-1100 if preferable.

ENABLE_ZSTD=OFF workarounds related to CDRIVER-3483 were removed, as the issues regarding inconsistent availability of ZSTD libraries was specific to macos-1014 and do not seem to be present on macos-1100. See related discussion in BUILD-16814 which motivated this PR.

add_expansions_to_env: true was removed from run-mock-kms-servers as some CFLAGS being defined for libmongoc compilation were interfering with compilation of some Python packages during package installation. The function did not actually require any expansions to behave correctly.

The scan_build matrix in #1205 will also need to be updated to use macos-1100 instead of macos-1014 once merged.

@eramongodb eramongodb requested a review from kevinAlbs February 16, 2023 19:26
@eramongodb eramongodb self-assigned this Feb 16, 2023
@eramongodb
Copy link
Contributor Author

Latest changes verified by this patch.

Copy link
Collaborator

@kevinAlbs kevinAlbs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, LGTM. I suggest leaving CDRIVER-4580 in the Backlog status with the fixVersion 1.24.0. I intended that ticket include the communication to drop macOS 10.14 in the 1.24.0 release.

@eramongodb eramongodb merged commit 822e78e into mongodb:master Feb 22, 2023
@eramongodb eramongodb deleted the cdriver-4580 branch February 22, 2023 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants