krombel/electron-universal
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix: handle MainMenu.nib mismatch in Electron 18 (#42)

Browse Source
This commit is contained in:
Samuel Attard
2022-03-09 11:04:13 -08:00
committed by GitHub
parent 2c3c1a60a0
commit 479e80d6a9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/index.ts
View File

@@ -115,6 +115,11 @@ export const makeUniversalApp = async (opts: MakeUniversalOpts): Promise<void> =
const arm64Sha = await sha(path.resolve(opts.arm64AppPath, file.relativePath)); const arm64Sha = await sha(path.resolve(opts.arm64AppPath, file.relativePath));
if (x64Sha !== arm64Sha) { if (x64Sha !== arm64Sha) {
d('SHA for file', file.relativePath, `does not match across builds ${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( throw new Error(
`Expected all non-binary files to have identical SHAs when creating a universal build but "${file.relativePath}" did not`, `Expected all non-binary files to have identical SHAs when creating a universal build but "${file.relativePath}" did not`,
); );