Skip to content

Commit fb5e608

Browse files
addaleaxgribnoysup
andauthored
fix(deps): bump electron to 32.2.1 COMPASS-8399 (#6387)
Also does the compass-specific bits of COMPASS-8253. Fixes: #6122 Fixes: #6334 Co-authored-by: Sergey Petushkov <[email protected]>
1 parent fa94752 commit fb5e608

File tree

33 files changed

+969
-2461
lines changed

33 files changed

+969
-2461
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const PACKAGE_BUILD_VARIANTS = [
2828
name: 'package-ubuntu',
2929
display_name: 'Package Ubuntu',
3030
31-
// # NOTE: We are packaging on Ubuntu 16.04 in order to use glibc 2.23
31+
// # NOTE: We are packaging on Ubuntu 18.04 in order to use glibc 2.27
3232
// # when compiling/re-building addons. This ensures compatibility with other
33-
// # debian platforms that have glibc 2.23 or newer.
34-
run_on: 'ubuntu1604-large',
33+
// # debian platforms that have glibc 2.27 or newer.
34+
run_on: 'ubuntu1804-large',
3535
silk_asset_group: 'compass-ubuntu',
3636
},
3737
{

.evergreen/buildvariants-and-tasks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ buildvariants:
3535
expansions:
3636
silk_asset_group: compass-ubuntu
3737
display_name: Package Ubuntu
38-
run_on: ubuntu1604-large
38+
run_on: ubuntu1804-large
3939
tasks:
4040
- name: package-compass
4141
- name: package-compass-isolated

.evergreen/print-compass-env.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function printCompassEnv() {
7171
// To build node modules on linux post electron 13 we need a newer c++
7272
// compiler version and at least python v3.9, this adds it.
7373
// https://jira.mongodb.org/browse/COMPASS-5150
74-
pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');
74+
pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
7575
}
7676

7777
PATH = maybePrependPaths(PATH, pathsToPrepend);
@@ -111,12 +111,8 @@ function printCompassEnv() {
111111
process.env.EVERGREEN_REVISION_ORDER_ID
112112
);
113113

114-
if (process.platform === 'darwin') {
115-
// Without this, kerberos 2.1.1 is broken on macOS, but this flag is only
116-
// really relevant for Linux.
117-
// https://jira.mongodb.org/browse/NODE-6320
118-
printVar('GYP_DEFINES', 'kerberos_use_rtld=false');
119-
}
114+
// https://jira.mongodb.org/browse/NODE-6320
115+
printVar('GYP_DEFINES', `kerberos_use_rtld=${process.platform === 'linux'}`);
120116
}
121117

122118
printCompassEnv();

configs/webpack-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
6969
"babel-loader": "^8.2.5",
7070
"babel-plugin-istanbul": "^5.2.0",
71-
"browserslist": "^4.24.0",
71+
"browserslist": "^4.24.2",
7272
"chalk": "^4.1.2",
7373
"cli-progress": "^3.9.1",
7474
"core-js": "^3.17.3",
7575
"css-loader": "^4.3.0",
76-
"electron": "^30.5.1",
76+
"electron": "^32.2.1",
7777
"html-webpack-plugin": "^5.6.0",
7878
"less": "^3.13.1",
7979
"less-loader": "^10.0.1",

0 commit comments

Comments
 (0)