Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): bump electron to 32.2.1 COMPASS-8399 #6387

Merged
merged 27 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ca4e40c
chore(deps): bump electron to 32.2.1 COMPASS-8399
addaleax Oct 22, 2024
c02c1f7
fixup: try bumping node-gyp, toolchain, python
addaleax Oct 22, 2024
3944f01
fixup: pin kerberos, different python version, bump nan
addaleax Oct 23, 2024
5261470
fixup: try opt-out from experimetnal node_api flag
addaleax Oct 23, 2024
fe5897b
fixup: back to latest kerberos...
addaleax Oct 23, 2024
e1acdd0
Merge remote-tracking branch 'origin/main' into electron-32
addaleax Oct 23, 2024
0be1bbf
fixup: regen package-lcok
addaleax Oct 23, 2024
3c404a0
fixup: no v4 toolchain on ubuntu1604
addaleax Oct 23, 2024
b698978
fixup: changed createDMG invocation
addaleax Oct 23, 2024
1f2efe8
chore(deps): update electron/rebuild dependency
gribnoysup Oct 23, 2024
83dfdba
chore(compass, hadron-build): only run electron-rebuild on linux
gribnoysup Oct 23, 2024
acfded4
Merge remote-tracking branch 'origin/update-electron-rebuild' into el…
addaleax Oct 23, 2024
e34657e
chore(deps): update kerberos to latest
gribnoysup Oct 24, 2024
92883d6
fixup: bump ubuntu build version to 18.04
addaleax Oct 24, 2024
b3a8cef
Merge remote-tracking branch 'origin/update-electron-rebuild' into el…
addaleax Oct 24, 2024
35335b0
Merge remote-tracking branch 'origin/main' into electron-32
addaleax Oct 24, 2024
9d14fa3
Merge remote-tracking branch 'origin/main' into electron-32
addaleax Oct 24, 2024
0f7079b
fixup: another fix for electron-installer-dmg bump
addaleax Oct 24, 2024
724724e
fixup: use electron.webUtils.getPathForFile for file inputs
addaleax Oct 24, 2024
9c27dd7
fixup: CR suggestion
addaleax Oct 24, 2024
982b11f
fixup: fix connection-form tests for FileInput change
addaleax Oct 25, 2024
85126c7
fixup: un-.only()
addaleax Oct 25, 2024
e996382
fixup: disable EditContext usage in codemirror?
addaleax Oct 28, 2024
1b22d7e
fixup: add TODO regarding chrome bug
addaleax Oct 28, 2024
fb4f812
fixup: use latest 32.x release with more security fixes
addaleax Oct 28, 2024
fb7de80
Merge remote-tracking branch 'origin/main' into electron-32
addaleax Oct 28, 2024
dea296b
Revert "fixup: use latest 32.x release with more security fixes"
addaleax Oct 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
{
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions .evergreen/print-compass-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
4 changes: 2 additions & 2 deletions configs/webpack-config-compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading