Skip to content

Commit 7b60bc8

Browse files
committed
chore(deps): update node-gyp to 10; remove workaround for windows; remove python 3.6 from path
1 parent b1bc75e commit 7b60bc8

File tree

5 files changed

+708
-296
lines changed

5 files changed

+708
-296
lines changed

.evergreen/node-gyp-bug-workaround.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

.evergreen/preinstall.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ if [ -n "$IS_WINDOWS" ]; then
3939
./node.exe node_modules/npm2/bin/npm-cli.js i -g npm@$NPM_VERSION
4040
rm -rf node_modules/npm2/
4141
chmod +x npm.cmd npm
42-
43-
cd ..
44-
.evergreen/node-gyp-bug-workaround.sh
4542
else
4643
if command -v ldd &> /dev/null && `ldd $(which bash) | grep 'libc.so' | awk '{print $3}'` | grep -Eq 'release version 2.(1|2[0-7])'; then
4744
echo "Installing unofficial nodejs compiled for glibc 2.17 v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."

.evergreen/print-compass-env.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,10 @@ function printCompassEnv() {
6868
}
6969

7070
if (process.env.PLATFORM === 'linux') {
71-
// To build node modules on linux post electron 13 we need
72-
// a newer c++ compiler version, this adds it.
71+
// To build node modules on linux post electron 13 we need a newer c++
72+
// compiler version and at least python v3.9, this adds it.
7373
// https://jira.mongodb.org/browse/COMPASS-5150
7474
pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');
75-
76-
// Make sure that linux is using python 3.6 (node-gyp requirement)
77-
pathsToPrepend.unshift('/opt/python/3.6/bin');
7875
}
7976

8077
PATH = maybePrependPaths(PATH, pathsToPrepend);
@@ -103,10 +100,16 @@ function printCompassEnv() {
103100
printVar('IS_RHEL', process.env.IS_RHEL);
104101
printVar('IS_UBUNTU', process.env.IS_UBUNTU);
105102
printVar('DEBUG', process.env.DEBUG);
106-
printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
103+
printVar(
104+
'MONGODB_VERSION',
105+
process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION
106+
);
107107
printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
108108
printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
109-
printVar('EVERGREEN_REVISION_ORDER_ID', process.env.EVERGREEN_REVISION_ORDER_ID);
109+
printVar(
110+
'EVERGREEN_REVISION_ORDER_ID',
111+
process.env.EVERGREEN_REVISION_ORDER_ID
112+
);
110113

111114
if (process.platform === 'darwin') {
112115
// Without this, kerberos 2.1.1 is broken on macOS, but this flag is only

0 commit comments

Comments
 (0)