Skip to content

Commit 04aa11e

Browse files
committed
Move back to install-npm-deps.sh
1 parent 7ecd9eb commit 04aa11e

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.evergreen/compile-artifact.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ set -e
33
set -x
44

55
cd $(pwd)
6-
export DISTRO_ID={$DISTRO_ID}
7-
source .evergreen/setup-env.sh
86

9-
echo "DISTRO ID IS: $DISTRO_ID"
7+
source .evergreen/setup-env.sh
108

119
# make sure our .sbom files are freshly created
1210
rm -vrf .sbom && mkdir -vp .sbom
@@ -19,12 +17,6 @@ if uname -a | grep -q 'Linux.*x86_64'; then
1917
export CXX="$PWD/tmp/.sccache/sccache g++"
2018
fi
2119

22-
# Needed to ensure Python 3.6 support which is the oldest one that's available out-of-the-box on the rhel70 hosts.
23-
if [[ "${DISTRO_ID}" =~ ^(rhel) ]]; then
24-
echo "RUNNING NODE-GYP@9"
25-
npm install node-gyp@9 --verbose --force
26-
fi
27-
2820
rm -rf /tmp/m && mkdir -pv /tmp/m # Node.js compilation can fail on long path prefixes
2921
trap "rm -rf /tmp/m" EXIT
3022
export TMP=/tmp/m

.evergreen/install-npm-deps.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ npm ci --verbose
55

66
echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE"
77

8+
echo "DISTRO ID: $DISTRO_ID"
9+
# Needed to ensure Python 3.6 support which is the oldest one that's available out-of-the-box on the rhel70 hosts.
10+
if [[ "${DISTRO_ID}" =~ ^(rhel) ]]; then
11+
echo "RUNNING NODE-GYP@9"
12+
npm install node-gyp@9 --verbose --force
13+
fi
14+
815
# if MONOGDB_DRIVER_VERSION_OVERRIDE is set, then we want to replace the package version
916
if [[ -n "$MONOGDB_DRIVER_VERSION_OVERRIDE" ]]; then
1017
export REPLACE_PACKAGE="mongodb:$MONOGDB_DRIVER_VERSION_OVERRIDE"

0 commit comments

Comments
 (0)