Closed NinjaCheetah closed 1 year ago
Currently conflicting, might have been fixed by #123 since I saw it changed these files.
I see that #123 does part of the work that I did (builds the DMG using package.json but doesn't use custom assets or any other options). I should be able to pretty easily rebase my changes on top of that and then it should be an easy merge. I'll also test my workflow again some to make sure the new changes to the package.json don't break there.
Ok it seems that #123 got rid of universal macOS builds. I'm reverting this change as I don't see any reason why you would want separate x86/ARM builds. (Also: the bug mentioned in the original comment for this PR does still apply, so that fix was added back in.)
Making a new overview of the changes I've made (this will be updated as I work):
ia32
architecture (Electron doesn't offer builds for ia32, reverts a change in #123)main.yml
and publish.yml
(removes warning from GitHub about Node.js 12 actions being deprecated)
The DMG created by
yarn build:mac
now matches the one created through the script. Thedmg-files/
directory has been removed and relevant build files have been moved tobuild/dmg/
. The CI run publishes this DMG which should cut down on build times since it can skip the step to installcreate-dmg
.electron-builder
was updated from v22 to v23 to support using Python 3 for the DMG creation script, allowing the app to be built on macOS 12.3+ which does not offer Python 2. This introduces a bug with universal builds that is mitigated within Package.json. No issues appeared for Linux or Windows.