Skip to content

Commit b219d69

Browse files
committed
move to compile-artifact
1 parent 3e4b3a4 commit b219d69

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.evergreen/compile-artifact.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ if uname -a | grep -q 'Linux.*x86_64'; then
1717
export CXX="$PWD/tmp/.sccache/sccache g++"
1818
fi
1919

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

25-
if [ `uname` = Darwin ]; then
31+
if [ $(uname) = Darwin ]; then
2632
# match what Node.js 20 does on their own builder machines
2733
export CFLAGS='-mmacosx-version-min=10.15'
2834
export CXXFLAGS='-mmacosx-version-min=10.15'

.evergreen/install-npm-deps.sh

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

66
echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE"
77

8-
echo "DISTRO ID IS: $DISTRO_ID"
9-
108
# if MONOGDB_DRIVER_VERSION_OVERRIDE is set, then we want to replace the package version
119
if [[ -n "$MONOGDB_DRIVER_VERSION_OVERRIDE" ]]; then
1210
export REPLACE_PACKAGE="mongodb:$MONOGDB_DRIVER_VERSION_OVERRIDE"
@@ -20,11 +18,6 @@ if [[ -n "$MONOGDB_DRIVER_VERSION_OVERRIDE" ]]; then
2018
npm i --verbose --force
2119
fi
2220

23-
# Needed to ensure Python 3.6 support which is the oldest one that's available out-of-the-box on the rhel70 hosts.
24-
if [[ "${DISTRO_ID}" =~ ^(rhel) ]]; then
25-
npm install node-gyp@9 --verbose --force
26-
fi
27-
2821
# if we rewrote this script in javascript using just builtin node modules we could skip the npm ci above
2922
npm run mark-ci-required-optional-dependencies
3023

0 commit comments

Comments
 (0)