WIP

Author: addaleax

.evergreen.yml

@@ -122,8 +122,10 @@ functions:
           DISTRO_ID: ${distro_id}
           MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
         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
@@ -160,8 +162,10 @@ functions:
           DISTRO_ID: ${distro_id}
           MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
         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:

.evergreen/evergreen.yml.in

@@ -131,8 +131,10 @@ functions:
           DISTRO_ID: ${distro_id}
           MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
         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
@@ -169,8 +171,10 @@ functions:
           DISTRO_ID: ${distro_id}
           MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
         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:

.evergreen/install-node.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 set -x
 export BASEDIR="$PWD/.evergreen"
@@ -12,6 +13,19 @@ if [ "$OS" == "Windows_NT" ]; then
 
   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
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
+
+    echo "Setting NVM environment home: $NVM_DIR"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+    set +x # nvm is very verbose
+    echo nvm install --no-progress $NODE_JS_VERSION && nvm alias default $NODE_JS_VERSION
+    nvm install --no-progress $NODE_JS_VERSION
+    nvm alias default $NODE_JS_VERSION
+    nvm use $NODE_JS_VERSION
+    set -x
+  fi
   npm cache clear --force || true # Try to work around `Cannot read property 'pickAlgorithm' of null` errors in CI
 fi
 

.evergreen/install-npm-deps.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 set -x
 

.evergreen/setup-env.sh

@@ -4,7 +4,7 @@ set -x
 OS_ARCH="$(uname "-m")"
 
 export BASEDIR="$PWD/.evergreen"
-export PATH="/opt/devtools/bin:/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:$PATH"
+export PATH="$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:$PATH"
 
 export MONGOSH_GLOBAL_CONFIG_FILE_FOR_TESTING="$BASEDIR/../../testing/tests-globalconfig.conf"
 
@@ -18,25 +18,25 @@ if [ x"$TERM" = x"dumb" ]; then
 fi
 echo "TERM variable is set to '${TERM:-}'"
 
-NODE_JS_MAJOR_VERSION=$(echo "$NODE_JS_VERSION" | awk -F . '{print $1}')
-if echo "$NODE_JS_MAJOR_VERSION" | grep -q '^[0-9]*$'; then
-  export PATH="/opt/devtools/node20/bin:$PATH"
-  echo "Detected Node.js version (requested v${NODE_JS_MAJOR_VERSION}.x):"
-  node -v
-  node -v | grep -q "^v$NODE_JS_MAJOR_VERSION"
-else
-  echo "Cannot identify major version from NODE_JS_VERSION: $NODE_JS_VERSION"
-  exit 1
-fi
-
 if [ "$OS" != "Windows_NT" ]; then
   if [ `uname` = Darwin ]; then
     echo "Using clang version:"
     (which clang && clang --version)
 
     echo "Using clang++ version:"
     (which clang++ && clang++ --version)
+
+    export NVM_DIR="$BASEDIR/.nvm"
+    echo "Setting NVM environment home: $NVM_DIR"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+    set +x # nvm is very verbose
+    echo nvm use $NODE_JS_VERSION || nvm use 20.11.1
+    nvm use $NODE_JS_VERSION || nvm use 20.11.1 # see install-node.sh
+    set -x
+    export PATH="$NVM_BIN:$PATH"
   else
+    export PATH="/opt/devtools/bin:$PATH"
+    export GIT_EXEC_PATH="/opt/devtools/libexec/git-core"
     export CC=gcc
     export CXX=g++
 
@@ -46,10 +46,19 @@ if [ "$OS" != "Windows_NT" ]; then
     echo "Using g++ version:"
     (which g++ && g++ --version)
   fi
+else
+  export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/cygdrive/c/cmake/bin:$PATH"
+fi
 
-  if [ -x "$BASEDIR/git-2/git" ]; then
-    export GIT_EXEC_PATH="$BASEDIR/git-2"
-  fi
+NODE_JS_MAJOR_VERSION=$(echo "$NODE_JS_VERSION" | awk -F . '{print $1}')
+if echo "$NODE_JS_MAJOR_VERSION" | grep -q '^[0-9]*$'; then
+  export PATH="/opt/devtools/node$NODE_JS_MAJOR_VERSION/bin:$PATH"
+  echo "Detected Node.js version (requested v${NODE_JS_MAJOR_VERSION}.x):"
+  node -v
+  node -v | grep -q "^v$NODE_JS_MAJOR_VERSION"
+else
+  echo "Cannot identify major version from NODE_JS_VERSION: $NODE_JS_VERSION"
+  exit 1
 fi
 
 export EVERGREEN_EXPANSIONS_PATH="$BASEDIR/../../tmp/expansions.yaml"