Merge branch 'main' into dependabot/npm_and_yarn/multi-7cce932503

Author: addaleax

.depalignrc.json

@@ -1,9 +1,7 @@
 {
   "ignore": {
     "@babel/core": [
-      "7.16.x",
-      "^7.19.6",
-      "^7.16.12"
+      "^7.26.10"
     ],
     "yaml": [
       "^2.3.1",

.evergreen.yml

@@ -121,9 +121,12 @@ functions:
           NODE_JS_VERSION: ${node_js_version}
           DISTRO_ID: ${distro_id}
           MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
+          PUPPETEER_SKIP_DOWNLOAD: "true"
         script: |
-          source .evergreen/install-node.sh
-          source .evergreen/install-npm-deps.sh
+          set -e
+          set -x
+          .evergreen/install-node.sh
+          .evergreen/install-npm-deps.sh
     - command: shell.exec
       params:
         working_dir: src
@@ -159,9 +162,12 @@ functions:
           NODE_JS_VERSION: ${node_js_version}
           DISTRO_ID: ${distro_id}
           MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
+          PUPPETEER_SKIP_DOWNLOAD: ${puppeteer_skip_download|true}
         script: |
-          source .evergreen/install-node.sh
-          source .evergreen/install-npm-deps.sh
+          set -e
+          set -x
+          .evergreen/install-node.sh
+          .evergreen/install-npm-deps.sh
     - command: s3.get
       type: setup
       params:
@@ -4304,7 +4310,6 @@ functions:
           {
           export NODE_JS_VERSION=${node_js_version}
           source .evergreen/setup-env.sh
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           npm run evergreen-release draft
           git add .
           git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
@@ -4324,7 +4329,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh download-and-list-artifacts
     - command: shell.exec
       params:
@@ -4353,7 +4357,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh publish -- --dry-run
 
   release_publish:
@@ -4372,7 +4375,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh publish
 
   run_perf_tests:
@@ -4939,6 +4941,7 @@ tasks:
           mongosh_test_id: "arg_parser"
           mongosh_run_only_in_package: "arg-parser"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_async_rewriter2
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -4957,6 +4960,7 @@ tasks:
           mongosh_test_id: "async_rewriter2"
           mongosh_run_only_in_package: "async-rewriter2"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_autocomplete
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -4975,6 +4979,7 @@ tasks:
           mongosh_test_id: "autocomplete"
           mongosh_run_only_in_package: "autocomplete"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_browser_repl
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -4993,6 +4998,7 @@ tasks:
           mongosh_test_id: "browser_repl"
           mongosh_run_only_in_package: "browser-repl"
           task_name: ${task_name}
+          puppeteer_skip_download: "false"
   - name: test_browser_runtime_core
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5011,6 +5017,7 @@ tasks:
           mongosh_test_id: "browser_runtime_core"
           mongosh_run_only_in_package: "browser-runtime-core"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_browser_runtime_electron
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5029,6 +5036,7 @@ tasks:
           mongosh_test_id: "browser_runtime_electron"
           mongosh_run_only_in_package: "browser-runtime-electron"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_build
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5047,6 +5055,7 @@ tasks:
           mongosh_test_id: "build"
           mongosh_run_only_in_package: "build"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_cli_repl
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5065,6 +5074,7 @@ tasks:
           mongosh_test_id: "cli_repl"
           mongosh_run_only_in_package: "cli-repl"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_connectivity_tests
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5083,6 +5093,7 @@ tasks:
           mongosh_test_id: "connectivity_tests"
           mongosh_run_only_in_package: "connectivity-tests"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_e2e_tests
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5101,6 +5112,7 @@ tasks:
           mongosh_test_id: "e2e_tests"
           mongosh_run_only_in_package: "e2e-tests"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_editor
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5119,6 +5131,7 @@ tasks:
           mongosh_test_id: "editor"
           mongosh_run_only_in_package: "editor"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_errors
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5137,6 +5150,7 @@ tasks:
           mongosh_test_id: "errors"
           mongosh_run_only_in_package: "errors"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_history
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5155,6 +5169,7 @@ tasks:
           mongosh_test_id: "history"
           mongosh_run_only_in_package: "history"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_i18n
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5173,6 +5188,7 @@ tasks:
           mongosh_test_id: "i18n"
           mongosh_run_only_in_package: "i18n"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_java_shell
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5191,6 +5207,7 @@ tasks:
           mongosh_test_id: "java_shell"
           mongosh_run_only_in_package: "java-shell"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_js_multiline_to_singleline
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5209,6 +5226,7 @@ tasks:
           mongosh_test_id: "js_multiline_to_singleline"
           mongosh_run_only_in_package: "js-multiline-to-singleline"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_logging
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5227,6 +5245,7 @@ tasks:
           mongosh_test_id: "logging"
           mongosh_run_only_in_package: "logging"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_mongosh
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5245,6 +5264,7 @@ tasks:
           mongosh_test_id: "mongosh"
           mongosh_run_only_in_package: "mongosh"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_node_runtime_worker_thread
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5263,6 +5283,7 @@ tasks:
           mongosh_test_id: "node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_service_provider_core
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5281,6 +5302,7 @@ tasks:
           mongosh_test_id: "service_provider_core"
           mongosh_run_only_in_package: "service-provider-core"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_service_provider_node_driver
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5299,6 +5321,7 @@ tasks:
           mongosh_test_id: "service_provider_node_driver"
           mongosh_run_only_in_package: "service-provider-node-driver"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_shell_api
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5317,6 +5340,7 @@ tasks:
           mongosh_test_id: "shell_api"
           mongosh_run_only_in_package: "shell-api"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_shell_evaluator
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5335,6 +5359,7 @@ tasks:
           mongosh_test_id: "shell_evaluator"
           mongosh_run_only_in_package: "shell-evaluator"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_snippet_manager
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5353,6 +5378,7 @@ tasks:
           mongosh_test_id: "snippet_manager"
           mongosh_run_only_in_package: "snippet-manager"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
   - name: test_types
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -5371,6 +5397,7 @@ tasks:
           mongosh_test_id: "types"
           mongosh_run_only_in_package: "types"
           task_name: ${task_name}
+          puppeteer_skip_download: "true"
 
   ###
   # INTEGRATION TESTS
@@ -11485,27 +11512,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

.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',

.evergreen/compile-artifact.sh

@@ -22,7 +22,7 @@ trap "rm -rf /tmp/m" EXIT
 export TMP=/tmp/m
 export TMPDIR=/tmp/m
 
-if [ `uname` = Darwin ]; then
+if [ $(uname) = Darwin ]; then
   # match what Node.js 20 does on their own builder machines
   export CFLAGS='-mmacosx-version-min=10.15'
   export CXXFLAGS='-mmacosx-version-min=10.15'
@@ -71,10 +71,11 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
     "--shared-openssl-libname='"$MONGOSH_OPENSSL_LIBNAME"'",
     "--shared-zlib"
   ]'
-  export LD_LIBRARY_PATH=/tmp/m/opt/lib
+  # python3's ssl module may not work with the OpenSSL we built here,
+  # so prefix the devtools toolchain one
+  export LD_LIBRARY_PATH=/opt/devtools/lib:/tmp/m/opt/lib
 fi
 
-export PUPPETEER_SKIP_DOWNLOAD="true"
 npm run evergreen-release compile
 dist/mongosh --version
 dist/mongosh --build-info