fix: (mac) Fix intel mac upgrade flow when both x64 and arm64 published #6212
Conversation
🦋 Changeset detectedLatest commit: 794787f The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
| // allow arm64 macs to install universal or rosetta2(x64) - https://github.com/electron-userland/electron-builder/pull/5524 | ||
| const isArm64 = (file: ResolvedUpdateFileInfo) => file.url.pathname.includes("arm64") || file.info.url?.includes("arm64") | ||
| if (files.some(isArm64)) { | ||
| files = files.filter(file => (process.arch === "arm64" || isRosetta) === isArm64(file)) |
There was a problem hiding this comment.
Would you mind explaining the change you made here, @johnnyopao? From my understanding, files = files.filter(file => (process.arch === "arm64" || isRosetta) === isArm64(file)) already handles both Intel & ARM64 cases. It would be equivalent to files = files.filter(file => true === isArm64(file)) on ARM64 Macs and files = files.filter(file => false === isArm64(file)) on Intel Macs.
There was a problem hiding this comment.
Ah I see, isRosetta could be undefined, causing the problem.
On Intel macs, the error
No files providedis thrown on the latest version of electron-updater (4.5.1) when the latest files include both arm64 and x64 builds.The current filtering done when there are arm64 files available will return an empty array since there are arm64 files but we are not on a arm64 machine
electron-builder/packages/electron-updater/src/MacUpdater.ts
Lines 55 to 57 in 64fd696
This change adjusts MacUpdater to filter the files to this criteria:
Steps to reproduce the bug:
"electron-updater": "^4.5.1"x64andarm64buildsExpected Behavior
The files list is filtered down and the x64/intel build is selected for download
Actual behavior
No files are returned after filtering. The
Error: No files providederror is thrown