Skip to content

Commit

Permalink
chore(deps): update node-gyp to 10; remove workaround for windows; re…
Browse files Browse the repository at this point in the history
…move python 3.6 from path COMPASS-8346 (#6390)

chore(deps): update node-gyp to 10; remove workaround for windows; remove python 3.6 from path
  • Loading branch information
gribnoysup authored Oct 23, 2024
1 parent b1bc75e commit 911b180
Show file tree
Hide file tree
Showing 5 changed files with 708 additions and 296 deletions.
53 changes: 0 additions & 53 deletions .evergreen/node-gyp-bug-workaround.sh

This file was deleted.

3 changes: 0 additions & 3 deletions .evergreen/preinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ if [ -n "$IS_WINDOWS" ]; then
./node.exe node_modules/npm2/bin/npm-cli.js i -g npm@$NPM_VERSION
rm -rf node_modules/npm2/
chmod +x npm.cmd npm

cd ..
.evergreen/node-gyp-bug-workaround.sh
else
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
echo "Installing unofficial nodejs compiled for glibc 2.17 v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."
Expand Down
17 changes: 10 additions & 7 deletions .evergreen/print-compass-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,10 @@ function printCompassEnv() {
}

if (process.env.PLATFORM === 'linux') {
// To build node modules on linux post electron 13 we need
// a newer c++ compiler version, this adds it.
// To build node modules on linux post electron 13 we need a newer c++
// compiler version and at least python v3.9, this adds it.
// https://jira.mongodb.org/browse/COMPASS-5150
pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');

// Make sure that linux is using python 3.6 (node-gyp requirement)
pathsToPrepend.unshift('/opt/python/3.6/bin');
}

PATH = maybePrependPaths(PATH, pathsToPrepend);
Expand Down Expand Up @@ -103,10 +100,16 @@ function printCompassEnv() {
printVar('IS_RHEL', process.env.IS_RHEL);
printVar('IS_UBUNTU', process.env.IS_UBUNTU);
printVar('DEBUG', process.env.DEBUG);
printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
printVar(
'MONGODB_VERSION',
process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION
);
printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
printVar('EVERGREEN_REVISION_ORDER_ID', process.env.EVERGREEN_REVISION_ORDER_ID);
printVar(
'EVERGREEN_REVISION_ORDER_ID',
process.env.EVERGREEN_REVISION_ORDER_ID
);

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

0 comments on commit 911b180

Please sign in to comment.