WIP

Author: addaleax

.evergreen/install-node.sh

@@ -12,21 +12,6 @@ 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 which realpath; then # No realpath on macOS, but also not needed there
-    export HOME="$(realpath "$HOME")" # Needed to de-confuse nvm when /home is a symlink
-  fi
-  # Some Node.js driver versions leave a ~/.npmrc file lying around
-  # that breaks nvm because it contains a 'prefix=' option (pointing
-  # to a directory that no longer exists anyway).
-  if [ -e "$HOME/.npmrc" ]; then
-    # different `sed` arguments on macOS than for GNU sed ...
-    if [ `uname` == Darwin ]; then
-      sed -i'~' -e 's/^prefix=.*$//' "$HOME/.npmrc"
-    else
-      sed -i "$HOME/.npmrc" -e 's/^prefix=.*$//'
-    fi
-  fi
-
   npm cache clear --force || true # Try to work around `Cannot read property 'pickAlgorithm' of null` errors in CI
 fi
 

.evergreen/setup-env.sh

@@ -4,7 +4,7 @@ set -x
 OS_ARCH="$(uname "-m")"
 
 export BASEDIR="$PWD/.evergreen"
-export PATH="/opt/devtools/node20/bin:/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="/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 MONGOSH_GLOBAL_CONFIG_FILE_FOR_TESTING="$BASEDIR/../../testing/tests-globalconfig.conf"
 
@@ -18,19 +18,16 @@ if [ x"$TERM" = x"dumb" ]; then
 fi
 echo "TERM variable is set to '${TERM:-}'"
 
-if [ "$OS" != "Windows_NT" ]; then
-  if which realpath; then # No realpath on macOS, but also not needed there
-    export HOME="$(realpath "$HOME")" # Needed to de-confuse nvm when /home is a symlink
-  fi
-  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"
+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"
+  node -v | grep -q "^v$NODE_JS_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)