Skip to content

Commit 315fefa

Browse files
authored
chore(ci): go back to consistently using v3 toolchain (#2054)
The v4 toolchain bump was not necessary and broke some of our arm64 qemu integration tests due to increased hardware requirements.
1 parent b72f74a commit 315fefa

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

.evergreen/install-node-source.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@ EVGDIR="$ROOT_DIR/.evergreen"
77
NVM_DIR="$EVGDIR/.nvm"
88
ORIGINAL_PATH="${PATH}"
99

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

.evergreen/setup-env.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
set -e
22
set -x
33

4-
OS_ARCH="$(uname "-m")"
5-
6-
if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
7-
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
8-
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
9-
else
10-
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
11-
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
12-
fi
13-
144
export BASEDIR="$PWD/.evergreen"
15-
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"
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"
6+
167
export IS_MONGOSH_EVERGREEN_CI=1
178
export DEBUG="mongodb*,$DEBUG"
189

0 commit comments

Comments
 (0)