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

feat: electron/universal has a new minimatch option 'x64ArchFiles' #6913

Merged
merged 2 commits into from
Jun 5, 2022

Conversation

obra
Copy link
Contributor

@obra obra commented Jun 1, 2022

Some projects need to ship x64 binaries which will be run under
Rosetta2 on arm64 Macs.

This option allows a packager to specify that they're aware that
certain files in their distribution which are included in both x64
and arm64 builds are actually x64 binaries in both builds.

Without this option, electron/universal will attempt to lipo
the two binaries together, resulting in a build failure.

@changeset-bot
Copy link

changeset-bot bot commented Jun 1, 2022

🦋 Changeset detected

Latest commit: 8a1f846

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 Minor
dmg-builder Minor
electron-builder-squirrel-windows Minor
electron-builder Minor
electron-forge-maker-appimage Minor
electron-forge-maker-nsis-web Minor
electron-forge-maker-nsis Minor
electron-forge-maker-snap Minor

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

@netlify
Copy link

netlify bot commented Jun 1, 2022

Deploy Preview for car-park-attendant-cleat-11576 ready!

Name Link
🔨 Latest commit 8a1f846
🔍 Latest deploy log https://app.netlify.com/sites/car-park-attendant-cleat-11576/deploys/6299784a182edf0008050763
😎 Deploy Preview https://deploy-preview-6913--car-park-attendant-cleat-11576.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@obra
Copy link
Contributor Author

obra commented Jun 1, 2022

The CircleCI failures don't appear tied to this change.

Is it local policy that you'd want a changeset for passing through a new config option? If so, I'd be happy to amend the PR.

Some projects need to ship x64 binaries which will be run under
Rosetta2 on arm64 Macs.

This option allows a packager to specify that they're aware that
certain files in their distribution which are included in both x64
and arm64 builds are actually x64 binaries in both builds.

Without this option, electron/universal will attempt to lipo
the two binaries together, resulting in a build failure.
@obra obra changed the title electron/universal has a new minimatch option 'x64ArchFiles' feat: electron/universal has a new minimatch option 'x64ArchFiles' Jun 3, 2022
@mmaietta
Copy link
Collaborator

mmaietta commented Jun 3, 2022

I think this should be fine for now, but I'll need to make a breaking change in the future, as we're adding too many items to the macOptions that are specific just to universal builds.
Basically, what I'd like is for us to have a universal: MakeUniversalOpts utilizing this export: https://github.com/electron/universal/blob/master/src/index.ts#L16
That way we can use Typescript's Omit w/ a dedicated interface that stays up to date with electron/universal.
Unfortunately a change like that would break the current API/config, and I don't think that is purely necessary at this time

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.

2 participants