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]>
mongodb-js · Oct 28, 2024 · fb5e608 · fb5e608
1 parent fa94752
commit fb5e608
Show file tree

Hide file tree

Showing 33 changed files with 969 additions and 2,461 deletions.
diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
@@ -28,10 +28,10 @@ const PACKAGE_BUILD_VARIANTS = [
     name: 'package-ubuntu',
     display_name: 'Package Ubuntu',
 
-    // # NOTE: We are packaging on Ubuntu 16.04 in order to use glibc 2.23
+    // # NOTE: We are packaging on Ubuntu 18.04 in order to use glibc 2.27
     // # when compiling/re-building addons. This ensures compatibility with other
-    // # debian platforms that have glibc 2.23 or newer.
-    run_on: 'ubuntu1604-large',
+    // # debian platforms that have glibc 2.27 or newer.
+    run_on: 'ubuntu1804-large',
     silk_asset_group: 'compass-ubuntu',
   },
   {

diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
@@ -35,7 +35,7 @@ buildvariants:
     expansions:
       silk_asset_group: compass-ubuntu
     display_name: Package Ubuntu
-    run_on: ubuntu1604-large
+    run_on: ubuntu1804-large
     tasks:
       - name: package-compass
       - name: package-compass-isolated

diff --git a/.evergreen/print-compass-env.js b/.evergreen/print-compass-env.js
@@ -71,7 +71,7 @@ function printCompassEnv() {
     // 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');
+    pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
   }
 
   PATH = maybePrependPaths(PATH, pathsToPrepend);
@@ -111,12 +111,8 @@ function printCompassEnv() {
     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
-    // really relevant for Linux.
-    // https://jira.mongodb.org/browse/NODE-6320
-    printVar('GYP_DEFINES', 'kerberos_use_rtld=false');
-  }
+  // https://jira.mongodb.org/browse/NODE-6320
+  printVar('GYP_DEFINES', `kerberos_use_rtld=${process.platform === 'linux'}`);
 }
 
 printCompassEnv();
diff --git a/configs/webpack-config-compass/package.json b/configs/webpack-config-compass/package.json
@@ -68,12 +68,12 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "babel-loader": "^8.2.5",
     "babel-plugin-istanbul": "^5.2.0",
-    "browserslist": "^4.24.0",
+    "browserslist": "^4.24.2",
     "chalk": "^4.1.2",
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^30.5.1",
+    "electron": "^32.2.1",
     "html-webpack-plugin": "^5.6.0",
     "less": "^3.13.1",
     "less-loader": "^10.0.1",