diff --git a/.evergreen/install-node-source.sh b/.evergreen/install-node-source.sh index b7fb0262f..62a3ef063 100755 --- a/.evergreen/install-node-source.sh +++ b/.evergreen/install-node-source.sh @@ -7,17 +7,7 @@ EVGDIR="$ROOT_DIR/.evergreen" NVM_DIR="$EVGDIR/.nvm" ORIGINAL_PATH="${PATH}" -OS_ARCH="$(uname "-m")" - -if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then - echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH" - export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin' -else - echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH" - export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin' -fi - -export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}" +export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}" export CC=gcc export CXX=g++ diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh index 1b6a88930..3263e5ea3 100755 --- a/.evergreen/setup-env.sh +++ b/.evergreen/setup-env.sh @@ -1,18 +1,9 @@ set -e set -x -OS_ARCH="$(uname "-m")" - -if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then - echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH" - export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin' -else - echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH" - export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin' -fi - export BASEDIR="$PWD/.evergreen" -export PATH="/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:$TOOLCHAIN_PATH:$PATH" +export PATH="/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:/opt/mongodbtoolchain/v3/bin:$PATH" + export IS_MONGOSH_EVERGREEN_CI=1 export DEBUG="mongodb*,$DEBUG"