From 795876223de3dff174322f78f7b73e36f31e8e0f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 26 Mar 2025 11:50:56 -0400 Subject: [PATCH 1/2] fix: stick to 8.0.5 for macOS crypt_shared and macOS 11 e2e tests --- .evergreen.yml | 12 ++++++------ .../build-variants/e2e-tests-build-variants.js | 4 ++-- .../build/src/packaging/download-crypt-library.ts | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 278feed0bc..af405a3e80 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -11485,27 +11485,27 @@ buildvariants: mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_darwin_arm64 - - name: e2e_tests_darwin - display_name: "MacOS Big Sur (E2E tests)" + - name: e2e_tests_darwin_m805 + display_name: "MacOS Big Sur 805 (E2E tests)" run_on: macos-11 tags: [] expansions: executable_os_id: "darwin-x64" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.0" - mongosh_server_test_version: "stable-enterprise" + mongosh_server_test_version: "8.0.5-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_darwin - - name: e2e_tests_darwin_arm64 - display_name: "MacOS Big Sur arm64 (E2E tests)" + - name: e2e_tests_darwin_arm64_m805 + display_name: "MacOS Big Sur arm64 805 (E2E tests)" run_on: macos-11-arm64 tags: [] expansions: executable_os_id: "darwin-arm64" disable_openssl_shared_config_for_bundled_openssl: false node_js_version: "20.19.0" - mongosh_server_test_version: "stable-enterprise" + mongosh_server_test_version: "8.0.5-enterprise" mongosh_test_e2e_force_fips: "" tasks: - name: e2e_tests_darwin_arm64 diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js index 3083de878b..0da9a7fd62 100644 --- a/.evergreen/build-variants/e2e-tests-build-variants.js +++ b/.evergreen/build-variants/e2e-tests-build-variants.js @@ -328,14 +328,14 @@ exports.E2E_TESTS_BUILD_VARIANTS = [ id: 'darwin', runOn: 'macos-11', executableOsId: 'darwin-x64', - mVersion: 'stable', + mVersion: '8.0.5', }, { displayName: 'MacOS Big Sur arm64', runOn: 'macos-11-arm64', id: 'darwin_arm64', executableOsId: 'darwin-arm64', - mVersion: 'stable', + mVersion: '8.0.5', additionalTasks: [ 'package_artifact_darwin_x64', 'sign_artifact_darwin_x64', diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts index 43cfec93aa..14977758f8 100644 --- a/packages/build/src/packaging/download-crypt-library.ts +++ b/packages/build/src/packaging/download-crypt-library.ts @@ -38,6 +38,9 @@ export async function downloadCryptLibrary( if (/ppc64|s390x/.test(opts.arch || process.arch)) { versionSpec = 'stable'; } + if (opts.platform === 'darwin') { + versionSpec = '8.0.5'; // TBD(SERVER-101020): Figure out at what point we use a later version. + } const { downloadedBinDir: libdir, version } = await downloadMongoDbWithVersionInfo(cryptTmpTargetDir, versionSpec, opts); const cryptLibrary = path.join( From fbd0ec8b2ecc315e257f7c46537ea6f285feaebf Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 26 Mar 2025 11:59:31 -0400 Subject: [PATCH 2/2] fixup: fall back to process.platform --- packages/build/src/packaging/download-crypt-library.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts index 14977758f8..7f68be16fe 100644 --- a/packages/build/src/packaging/download-crypt-library.ts +++ b/packages/build/src/packaging/download-crypt-library.ts @@ -38,7 +38,7 @@ export async function downloadCryptLibrary( if (/ppc64|s390x/.test(opts.arch || process.arch)) { versionSpec = 'stable'; } - if (opts.platform === 'darwin') { + if ((opts.platform || process.platform) === 'darwin') { versionSpec = '8.0.5'; // TBD(SERVER-101020): Figure out at what point we use a later version. } const { downloadedBinDir: libdir, version } =