Skip to content

Commit 5875532

Browse files
committed
Try to use toolchain v4
1 parent 25b29f4 commit 5875532

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

.evergreen/install-node-source.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ EVGDIR="$ROOT_DIR/.evergreen"
77
NVM_DIR="$EVGDIR/.nvm"
88
ORIGINAL_PATH="${PATH}"
99

10+
OS_ARCH="$(uname "-m")"
11+
if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
12+
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
13+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
14+
else
15+
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
16+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
17+
fi
18+
export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
19+
1020
export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
1121
export CC=gcc
1222
export CXX=g++

.evergreen/setup-env.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
set -e
22
set -x
33

4+
OS_ARCH="$(uname "-m")"
5+
if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
6+
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
7+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
8+
else
9+
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
10+
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
11+
fi
12+
413
export BASEDIR="$PWD/.evergreen"
5-
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"
14+
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"
615

716
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
817
export IS_MONGOSH_EVERGREEN_CI=1

0 commit comments

Comments
 (0)