Skip to content

Commit

Permalink
Move back to install-npm-deps.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
gagik committed Oct 22, 2024
1 parent 7ecd9eb commit 04aa11e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
10 changes: 1 addition & 9 deletions .evergreen/compile-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ set -e
set -x

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

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

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

# Needed to ensure Python 3.6 support which is the oldest one that's available out-of-the-box on the rhel70 hosts.
if [[ "${DISTRO_ID}" =~ ^(rhel) ]]; then
echo "RUNNING NODE-GYP@9"
npm install node-gyp@9 --verbose --force
fi

rm -rf /tmp/m && mkdir -pv /tmp/m # Node.js compilation can fail on long path prefixes
trap "rm -rf /tmp/m" EXIT
export TMP=/tmp/m
Expand Down
7 changes: 7 additions & 0 deletions .evergreen/install-npm-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ npm ci --verbose

echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE"

echo "DISTRO ID: $DISTRO_ID"
# Needed to ensure Python 3.6 support which is the oldest one that's available out-of-the-box on the rhel70 hosts.
if [[ "${DISTRO_ID}" =~ ^(rhel) ]]; then
echo "RUNNING NODE-GYP@9"
npm install node-gyp@9 --verbose --force
fi

# if MONOGDB_DRIVER_VERSION_OVERRIDE is set, then we want to replace the package version
if [[ -n "$MONOGDB_DRIVER_VERSION_OVERRIDE" ]]; then
export REPLACE_PACKAGE="mongodb:$MONOGDB_DRIVER_VERSION_OVERRIDE"
Expand Down

0 comments on commit 04aa11e

Please sign in to comment.