Merge branch 'main' into gagik/report-individual-tests

mongodb-js · Oct 23, 2024 · 356538b · 356538b
2 parents 65783f3 + 6f46d3a
commit 356538b
Show file tree

Hide file tree

Showing 7 changed files with 728 additions and 639 deletions.
diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh
@@ -1,8 +1,12 @@
 set -e
 set -x
 
-npm ci --verbose
+if [[ "${DISTRO_ID}" =~ ^(rhel|ubuntu1804) ]]; then
+  # RHEL and Ubuntu 18.04 use Python 3.6 which isn't supported by newer node-gyp versions
+  npm i node-gyp@9 --verbose --force
+fi
 
+npm ci --verbose
 echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE"
 
 # if MONOGDB_DRIVER_VERSION_OVERRIDE is set, then we want to replace the package version
@@ -30,4 +34,4 @@ npm run mark-ci-required-optional-dependencies
 npm run evergreen-release bump
 
 echo "npm packages after installation"
-npm ls || true
+npm ls || true
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Sun Oct 20 2024.
+This document was automatically generated on Tue Oct 22 2024.
 
 ## List of dependencies