Skip to content

Commit

Permalink
fix: handle MainMenu.nib mismatch in Electron 18 (#42)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Mar 9, 2022
1 parent 2c3c1a6 commit 479e80d
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ export const makeUniversalApp = async (opts: MakeUniversalOpts): Promise<void> =
const arm64Sha = await sha(path.resolve(opts.arm64AppPath, file.relativePath));
if (x64Sha !== arm64Sha) {
d('SHA for file', file.relativePath, `does not match across builds ${x64Sha}!=${arm64Sha}`);
// The MainMenu.nib files generated by Xcode13 are deterministic in effect but not deterministic in generated sequence
if (path.basename(path.dirname(file.relativePath)) === 'MainMenu.nib') {
// The mismatch here is OK so we just move on to the next one
continue;
}
throw new Error(
`Expected all non-binary files to have identical SHAs when creating a universal build but "${file.relativePath}" did not`,
);
Expand Down

0 comments on commit 479e80d

Please sign in to comment.