Skip to content

Commit 060d82c

Browse files
authored
chore(ci): use devtools toolchain COMPASS-5252 (#6854)
In theory, this would also allow us to skip Node.js downloads on Linux, but for this patch I'd just focus on removing our dependence on the server toolchain.
1 parent 8b83464 commit 060d82c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.evergreen/print-compass-env.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function printVar(name, value) {
2222
function printCompassEnv() {
2323
let {
2424
// This is an env var set in bash that we exported in print-compass-env.sh
25-
OSTYPE
25+
OSTYPE,
2626
} = process.env;
2727

2828
// We have to operate on bash's PATH env var where the c:\ style paths have
@@ -55,6 +55,13 @@ function printCompassEnv() {
5555

5656
const pathsToPrepend = [];
5757

58+
if (process.env.PLATFORM === 'linux') {
59+
// To build node modules on linux post electron 13 we need a newer c++
60+
// compiler version and at least python v3.9, this adds it.
61+
// https://jira.mongodb.org/browse/COMPASS-5150
62+
pathsToPrepend.unshift('/opt/devtools/bin');
63+
}
64+
5865
if (OSTYPE === 'cygwin') {
5966
// NOTE lucas: for git-core addition, See
6067
// https://jira.mongodb.org/browse/COMPASS-4122
@@ -68,13 +75,6 @@ function printCompassEnv() {
6875
pathsToPrepend.unshift(`${newPWD}/.deps/bin`);
6976
}
7077

71-
if (process.env.PLATFORM === 'linux') {
72-
// To build node modules on linux post electron 13 we need a newer c++
73-
// compiler version and at least python v3.9, this adds it.
74-
// https://jira.mongodb.org/browse/COMPASS-5150
75-
pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
76-
}
77-
7878
pathsToPrepend.unshift(`${originalPWD}/.evergreen/docker-config/bin`);
7979

8080
PATH = maybePrependPaths(PATH, pathsToPrepend);

0 commit comments

Comments
 (0)