feat: add arm64 build support #2344

gnattu · 2020-12-10T06:24:47Z

This will enable the build for arm64 via npm run build:arm64, fixes #2342

Most changes are made for Apple Silicon as upstream hard-coded Mac targets as x86_64, linux_arm64 should just work.

Known issues:

~~dmg cannot build on Big Sur, got an Operation not permitted error during file copy. The app itself can be packed, and be zipped~~. Fixed by 10cbf70
~~c68b392 prevents the packaged app to load because babel-register.config can not be found.~~ Fixed by a0ab927
For MAS we need to create a universal binary, which is not implemented yet.
Linux arm64 artifacts cannot be built on arm64 based Linux yet, as upstream does not offer required binaries: FPM armv7l package electron-userland/electron-builder-binaries#17
rpm and pacman artifacts are having wrong architecture name that will prevent the installation in current release of electron-builder, already fixed in fix(arm64): fix pacman build, pacman & rpm artifact names electron-userland/electron-builder#5304 by upstream, awaiting new release include that commit. Fixed by f1d4222
~~arm64 nsis target failed to build on Windows, as upstream set the macro wrong Universal NSIS setup file for x64+arm64 (WoA) is broken electron-userland/electron-builder#5461~~ Fixed by db754b9. We are having different configs for arm64 and x86_64 now.

gnattu · 2020-12-10T17:01:11Z

dmg creation bug submitted to upstream: electron-userland/electron-builder#5465

app.js

KagamiChan · 2020-12-13T16:28:23Z

views/components/settings/display/resolution-config.es

@@ -48,13 +46,16 @@ export class ResolutionConfig extends Component {
      (this.props.isolateGameWindow ? this.props.webview.windowWidth : this.props.webview.width) *
        this.props.zoomLevel,
    ),
-    ...getMinArea(screen.getAllDisplays()),
+    ...getMinArea(ipcRenderer.sendSync('get-all-displays')),


I think we may change to use async calls here, but this could be done later

app.js

KagamiChan · 2020-12-13T16:34:15Z

I think we still need to wait for the support from electron-builder side
in the meantime the upgrade to next version of electron is good and could be done first

KagamiChan · 2020-12-13T16:36:34Z

package.json

    "start": "electron .",
    "start_debug": "electron . --dev --inspect",
    "dev": "electron . --dev --inspect",
    "clean": "gulp clean",
    "lint:js": "eslint . --ext .es --ext .js --ext .ts --ext .tsx --ignore-path .gitignore",
    "lint:css": "stylelint views/**/*.css assets/**/*.css --config .stylelintrc.css.js",
    "lint:styled": "stylelint views/**/*.es --config .stylelintrc.js",
-    "lint": "npm run lint:js && npm run lint:css && npm run lint:styled"
+    "lint": "npm run lint:js && npm run lint:css && npm run lint:styled",
+    "postinstall": "patch-package"


This npm script will run for each npm install

since we don't always build the app, there's no need to patch every time.I think we can call it before we start to build

gnattu · 2020-12-14T04:49:12Z

I think we still need to wait for the support from electron-builder side

Exactly, it's why this is only a draft. I think we should wait until electron-userland/electron-builder#5426 is merged.

However, arm64 support for Windows and Linux is merged at least one year ago and still having serious issues. I think patching upstream will be necessary for a long time to enable correct building.

gnattu · 2020-12-14T22:45:45Z

Now the upstream merged the PR and released a beta version, but that version breaks npm install on non-macOS platforms as it introduced a new dependency that is not compatible with Windows and Linux. The fix is already in master but we have to wait for next release to begin the work to make the arm64 builds as default targets.

Two limitations mentioned in this PR are hard to resolve at the moment:

We have to build linux-arm64 targets on an x86 machine, this is not a big deal for us as our CI is on x86.
nsis does not work for x86+arm mixed, we have to either build two nsis targets by changing the current building process(which will also affect auto update), or not providing nsis for arm64 at all until upstream figured out how to provide a proper nsis script for such configuration.

Another side note:

I have not tested to build mac-arm64 targets on macOS < 11 yet and I cannot guarantee it will work. It may fail on our CI which is currently on 10.15

gnattu · 2020-12-20T12:57:37Z

CI failure is not related to the changes:

Error uploading artifact the storage: The underlying connection was closed: An unexpected error occurred on a receive.

quanglam2807 · 2020-12-25T04:09:15Z

build-arm64.yaml

+      arch:
+        - arm64
+nsis:
+  artifactName: 'poi-setup-${version}-arm64.${ext}'


This adds arm64 suffix to the NSIS file name. But electron-builder also creates a latest.yml to use with electron-updater. The name is latest.yml for both x64 and arm64 so they end up overwriting each other. Any solution?

I managed to patch this. You can apply this patch to poi as well: https://github.com/webcatalog/webcatalog-app/pull/1253/files

.gitignore

KagamiChan · 2021-02-03T05:05:43Z

seems upstream electron-builder has released the support for apple silicon, we can start the code cleanup work and land the new version of electron asap

KagamiChan · 2021-02-03T05:06:47Z

if not possible I'd prefer picking up the electron 11 support first, electron 11 and apple silicon are 2 things IMO

KochiyaOcean · 2021-02-03T05:12:22Z

If the blocker is Linux arm64, I think we can merge it and deliver Windows arm64 &macOS arm64 first

KagamiChan · 2021-11-20T14:47:24Z

Seems this could be closed?

gnattu added 5 commits December 9, 2020 22:50

feat: patch upstream for Apple Silicon build

9f9e3c8

fix: volume button does not change state

a6487f9

fix: deprecate remote for electron 11

775fdfd

fix: duplicated patch entry

3e2f48b

feat: add arm64 build option

d8a54ae

gnattu added 4 commits December 10, 2020 19:38

fix: HFS+ broken on Big Sur

abacf3e

fix: statfs$INODE64 deprecated

7cbcf85

fix: build with macOS < 11

f2fd85d

fix: indent

3a16bbc

gnattu self-assigned this Dec 12, 2020

KagamiChan reviewed Dec 13, 2020

View reviewed changes

app.js Outdated Show resolved Hide resolved

KagamiChan reviewed Dec 13, 2020

View reviewed changes

app.js Outdated Show resolved Hide resolved

KagamiChan reviewed Dec 13, 2020

View reviewed changes

chore: use scoped event names & clean up

34c3b53

fix: gpu status does not load

4c480d7

gnattu added 10 commits December 19, 2020 00:32

chore: ignore macOS meta file

d3fe880

chore: add comment on electron window.open() issue

e1ab289

chore: bump electron-builder

f1d4222

fix: incorrect signing on non-binary

28abf87

fix: PULL_REQUEST_TEMPLATE is not a binary

10cbf70

chore: remove debug

28f30ee

fix: npm caused wrong package-lock

ebd3e16

feat: add arm64 build config

de0b41b

chore: remove hardcoded electron version

7633529

fix: arm64 nsis won’t build without x64 set

db754b9

gnattu added 7 commits December 20, 2020 09:49

feat: add arm64 build to ci

18fc416

feat: add arm64 build for Windows and Linux CI

a4bcd9c

fix: multiline script does not run on Windows(azure-pipeline)

ce97957

fix: remove uncessary script

b465138

fix: timeout on Linux ci

26cddc8

fix: increase total timeout for linux ci

afc54b6

fix: increase timeout for Windows CI

60a5049

gnattu marked this pull request as ready for review December 20, 2020 11:14

gnattu changed the title ~~[WIP] feat: add arm64 build support~~ feat: add arm64 build support Dec 20, 2020

gnattu added 2 commits December 21, 2020 21:07

fix: workaroud for touchbar popover not showing up on electron 11

eb4b21b

feat: update touchbar icon

ddbabc7

quanglam2807 reviewed Dec 25, 2020

View reviewed changes

fix: windows updater conflict

122898a

KagamiChan reviewed Dec 27, 2020

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

fix: newline

bb3dbff

KagamiChan force-pushed the master branch 2 times, most recently from 277793c to f504e04 Compare February 17, 2021 08:46

KagamiChan closed this Nov 20, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add arm64 build support #2344

feat: add arm64 build support #2344

gnattu commented Dec 10, 2020 •

edited

Loading

gnattu commented Dec 10, 2020

KagamiChan Dec 13, 2020

KagamiChan commented Dec 13, 2020

KagamiChan Dec 13, 2020 •

edited

Loading

gnattu commented Dec 14, 2020

gnattu commented Dec 14, 2020 •

edited

Loading

gnattu commented Dec 20, 2020

quanglam2807 Dec 25, 2020

quanglam2807 Dec 25, 2020

KagamiChan commented Feb 3, 2021

KagamiChan commented Feb 3, 2021

KochiyaOcean commented Feb 3, 2021

KagamiChan commented Nov 20, 2021

feat: add arm64 build support #2344

feat: add arm64 build support #2344

Conversation

gnattu commented Dec 10, 2020 • edited Loading

gnattu commented Dec 10, 2020

KagamiChan Dec 13, 2020

Choose a reason for hiding this comment

KagamiChan commented Dec 13, 2020

KagamiChan Dec 13, 2020 • edited Loading

Choose a reason for hiding this comment

gnattu commented Dec 14, 2020

gnattu commented Dec 14, 2020 • edited Loading

gnattu commented Dec 20, 2020

quanglam2807 Dec 25, 2020

Choose a reason for hiding this comment

quanglam2807 Dec 25, 2020

Choose a reason for hiding this comment

KagamiChan commented Feb 3, 2021

KagamiChan commented Feb 3, 2021

KochiyaOcean commented Feb 3, 2021

KagamiChan commented Nov 20, 2021

gnattu commented Dec 10, 2020 •

edited

Loading

KagamiChan Dec 13, 2020 •

edited

Loading

gnattu commented Dec 14, 2020 •

edited

Loading