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: ignore differences caused by merged machO files #66

Merged
merged 3 commits into from
Nov 21, 2023

Conversation

macdja38
Copy link
Contributor

Problem Description:

Once the strategy to merge the files succeeds we know the MachO files we've generated can run on both arm64 and x64. One interesting quirk here is @electron/universal only modifies the temp folder MachO files. It doesn't touch the arm64 folder.
That becomes a problem when the arm64 folder is compared with the temporary folder.
@electron/universal has modified the MachO files in the temp folder. So they should certainly be different from the ones in the arm64 folder.

Solution Description:

This PR ads a set of files that @electron/universal merged, and then checks the results of the compare to specifically check that files other than the merged MachO files are different.

@macdja38 macdja38 requested a review from a team as a code owner March 15, 2023 07:13
@erickzhao erickzhao changed the title Ignore differences caused by merged machO files fix: ignore differences caused by merged machO files Mar 16, 2023
@MarshallOfSound MarshallOfSound merged commit 20b1b02 into electron:main Nov 21, 2023
Copy link

🎉 This PR is included in version 2.0.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants