Merge branch 'main' into MONGOSH-2486-add-legacy-uuid-support

Author: Anemy

.evergreen.yml

@@ -15,14 +15,4 @@ Write-Output "$filename downloaded"
 Write-Output "Time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
 
 Expand-Archive $node_zip -DestinationPath $PSScriptRoot
-Get-ChildItem -Path $PSScriptRoot
-
-Set-Location -Path $node_dir
-Remove-Item .\npm
-Remove-Item .\npm.cmd
-if (Test-Path .\npm.ps1) { Remove-Item .\npm.ps1 }
-Remove-Item .\npx
-Remove-Item .\npx.cmd
-if (Test-Path .\npx.ps1) { Remove-Item .\npx.ps1 }
-Move-Item .\node_modules\npm -Destination .\node_modules\npm2
-.\node.exe .\node_modules\npm2\bin\npm-cli.js i -g npm@6
+Get-ChildItem -Path $PSScriptRoot

.evergreen/InstallNode.ps1

@@ -10,6 +10,7 @@ export type UnitTestsBuildVariant = {
   nShort: string;
   nVersion: string;
   skipNodeVersionCheck: boolean;
+  disable: boolean;
 };
 
 export const UNIT_TESTS_BUILD_VARIANTS: UnitTestsBuildVariant[];

.evergreen/build-variants/unit-tests-build-variants.d.ts

@@ -13,6 +13,7 @@ for (const {
   shortName: nShort,
   versionSpec: nVersion,
   skipNodeVersionCheck,
+  optional,
 } of NODE_VERSIONS) {
   for (const platform of PLATFORMS) {
     const platformDetails = platformToDetails[platform];
@@ -27,6 +28,7 @@ for (const {
       nShort,
       nVersion,
       skipNodeVersionCheck,
+      disable: optional === true,
     });
     for (const {
       shortName: mShort,
@@ -64,6 +66,7 @@ for (const {
         mShort,
         mVersion,
         skipNodeVersionCheck,
+        disable: optional === true,
       });
     }
   }

.evergreen/build-variants/unit-tests-build-variants.js

@@ -24,6 +24,9 @@ exports.platformToDetails = {
 const NODE_JS_VERSION_20 = require('./node-20-latest.json').version;
 exports.NODE_JS_VERSION_20 = NODE_JS_VERSION_20;
 
+const NODE_JS_VERSION_24 = require('./node-24-latest.json').version;
+exports.NODE_JS_VERSION_24 = NODE_JS_VERSION_24;
+
 exports.MONGODB_VERSIONS = [
   { shortName: '42xc', versionSpec: '4.2.x' },
   { shortName: '42xe', versionSpec: '4.2.x-enterprise' },
@@ -47,5 +50,12 @@ exports.NODE_VERSIONS = [
     shortName: '20',
     versionSpec: NODE_JS_VERSION_20,
     skipNodeVersionCheck: '',
+    optional: false,
+  },
+  {
+    shortName: '24',
+    versionSpec: NODE_JS_VERSION_24,
+    skipNodeVersionCheck: '',
+    optional: true,
   },
 ];

.evergreen/constants.js

@@ -1166,6 +1166,7 @@ tasks:
       - func: install
         vars:
           node_js_version: ${node_js_version}
+          puppeteer_skip_download: "<% out(usePuppeteer ? "false" : "true") %>"
       - func: test
         vars:
           mongosh_server_test_version: ${mongosh_server_test_version}
@@ -1174,7 +1175,6 @@ tasks:
           mongosh_test_id: "<% out(id) %>"
           mongosh_run_only_in_package: "<% out(packageName) %>"
           task_name: ${task_name}
-          puppeteer_skip_download: "<% out(usePuppeteer ? "false" : "true") %>"
   <% } %>
 
   ###
@@ -1560,6 +1560,7 @@ buildvariants:
     display_name: "<% out(variant.displayName) %>"
     run_on: <% out(variant.runOn) %>
     tags: <% out(variant.tags) %>
+    disable: <% out(variant.disable) %>
     expansions:
       executable_os_id: <% out(variant.executableOsId) %>
       mongosh_server_test_version: "<% out(variant.mVersion || '') %>"

.evergreen/evergreen.yml.in

@@ -3,20 +3,14 @@ set -e
 set -x
 export BASEDIR="$PWD/.evergreen"
 
-NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
-
 if [ "$OS" == "Windows_NT" ]; then
   powershell "$(cygpath -w "$BASEDIR")"/InstallNode.ps1
   . "$BASEDIR/setup-env.sh"
-  mkdir -p "$BASEDIR/npm-10" && (cd "$BASEDIR/npm-10" && echo '{}' > package.json && npm i npm@$NPM_VERSION)
-  # using npm 10 because npm 9.9.3 does not install well on windows
-
-  curl -sSfLO https://raw.githubusercontent.com/mongodb-js/compass/42e6142ae08be6fec944b80ff6289e6bcd11badf/.evergreen/node-gyp-bug-workaround.sh && bash node-gyp-bug-workaround.sh
 else
   if [ `uname` = Darwin ]; then
     export NVM_DIR="$BASEDIR/.nvm"
     mkdir -p "${NVM_DIR}"
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
 
     echo "Setting NVM environment home: $NVM_DIR"
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

.evergreen/install-node.sh

@@ -1,16 +1,16 @@
 {
-  "version": "20.19.5",
+  "version": "20.19.6",
   "major": 20,
   "minor": 19,
-  "patch": 5,
+  "patch": 6,
   "tag": "",
   "codename": "iron",
   "versionName": "v20",
   "start": "2023-04-18T00:00:00.000Z",
   "lts": "2023-10-24T00:00:00.000Z",
   "maintenance": "2024-10-22T00:00:00.000Z",
   "end": "2026-04-30T00:00:00.000Z",
-  "releaseDate": "2025-09-03T00:00:00.000Z",
+  "releaseDate": "2025-11-25T00:00:00.000Z",
   "isLts": true,
   "isSupported": true,
   "isMaintenance": true,
@@ -44,6 +44,6 @@
     "v8": "11.3.244.8",
     "uv": "1.46.0",
     "zlib": "1.3.1",
-    "openssl": "3.0.16"
+    "openssl": "3.0.17"
   }
 }

.evergreen/node-20-latest.json

@@ -0,0 +1,44 @@
+{
+  "version": "24.11.1",
+  "major": 24,
+  "minor": 11,
+  "patch": 1,
+  "tag": "",
+  "codename": "krypton",
+  "versionName": "v24",
+  "start": "2025-05-06T00:00:00.000Z",
+  "lts": "2025-10-28T00:00:00.000Z",
+  "maintenance": "2026-10-20T00:00:00.000Z",
+  "end": "2028-04-30T00:00:00.000Z",
+  "releaseDate": "2025-11-11T00:00:00.000Z",
+  "isLts": true,
+  "isSupported": true,
+  "isMaintenance": false,
+  "isSecurity": false,
+  "modules": "137",
+  "files": [
+    "aix-ppc64",
+    "headers",
+    "linux-arm64",
+    "linux-ppc64le",
+    "linux-s390x",
+    "linux-x64",
+    "osx-arm64-tar",
+    "osx-x64-pkg",
+    "osx-x64-tar",
+    "src",
+    "win-arm64-7z",
+    "win-arm64-zip",
+    "win-x64-7z",
+    "win-x64-exe",
+    "win-x64-msi",
+    "win-x64-zip"
+  ],
+  "dependencies": {
+    "npm": "11.6.2",
+    "v8": "13.6.233.10",
+    "uv": "1.51.0",
+    "zlib": "1.3.1",
+    "openssl": "3.5.4"
+  }
+}

.evergreen/node-24-latest.json

@@ -4,8 +4,7 @@ set -x
 OS_ARCH="$(uname "-m")"
 
 export BASEDIR="$PWD/.evergreen"
-export PATH="$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:$PATH"
-
+export PATH="$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk17/bin:$PATH"
 export MONGOSH_GLOBAL_CONFIG_FILE_FOR_TESTING="$BASEDIR/../../testing/tests-globalconfig.conf"
 
 export IS_MONGOSH_EVERGREEN_CI=1
@@ -69,7 +68,7 @@ fi
 
 # On RHEL hosts, we run as root for some reason
 if [ `uname` = Linux ]; then
-  export npm_config_unsafe_perm=true
+    export npm_config_unsafe_perm=true
 fi
 
 # npm@7 changed the behavior to run install scripts for packages