Skip to content

Conversation

t3chguy
Copy link
Contributor

@t3chguy t3chguy commented Jan 22, 2025

Without this @electron/universal would error complaining that the x64 and the arm64 builds varied in an unexpected place. Could have maybe overridden addElectronFuses in MacPackager, but we didn't have a reference to the fact we were building a universal package from the param in doPack and didn't want to explore adding more properties in the area.

Fixes #8798

…package

Without this `@electron/universal` would error complaining that the x64 and the arm64 builds varied in an unexpected place.
Could have maybe overridden `addElectronFuses` in MacPackager, but we didn't have a reference to the fact we were building a universal package from the param in `doPack` and didn't want to explore adding more properties in the area.

Fixes electron-userland#8798
Copy link

changeset-bot bot commented Jan 22, 2025

🦋 Changeset detected

Latest commit: e94457f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 8 packages
Name Type
app-builder-lib Patch
dmg-builder Patch
electron-builder-squirrel-windows Patch
electron-builder Patch
electron-forge-maker-appimage Patch
electron-forge-maker-nsis-web Patch
electron-forge-maker-nsis Patch
electron-forge-maker-snap Patch

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

@t3chguy
Copy link
Contributor Author

t3chguy commented Jan 22, 2025

Running tests locally proved a pain:

macOS Catalina doesn't support 32-bit executables and as result Wine cannot run Windows 32-bit applications too

@t3chguy t3chguy marked this pull request as ready for review January 22, 2025 23:33
@mmaietta
Copy link
Collaborator

Very elegant of a fix, thank you!

The number of args being passed to doPack has me worried now though, as 3 args of all booleans can easily get swapped around. If you don't mind, I'd like to add a very small refactor to this PR converting the doPack args into some typed object(s). Would that be okay?

@t3chguy
Copy link
Contributor Author

t3chguy commented Jan 23, 2025

The number of args being passed to doPack has me worried now though, as 3 args of all booleans can easily get swapped around. If you don't mind, I'd like to add a very small refactor to this PR converting the doPack args into some typed object(s). Would that be okay?

Sure thing

@t3chguy
Copy link
Contributor Author

t3chguy commented Jan 23, 2025

@mmaietta sorry to confirm, are you going to push those changes to my branch or would you like me to do them? Happy either way, if the latter then please just clarify if you expect all the params to be wrapped up in a Context-like struct or just the boolean flags

@mmaietta
Copy link
Collaborator

No actions needed from your side. I should be able to push to this PR directly using gh pr checkout, I'll let you know if it doesn't work

@mmaietta mmaietta merged commit 45a402b into electron-userland:master Jan 24, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

electronFuses doesn't work for universal builds
2 participants