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.

Sign up for GitHub

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

Jump to bottom

Arm support 2625 #6185

Merged
merged 14 commits into from
Nov 27, 2023
Merged

Arm support 2625 #6185

merged 14 commits into from
Nov 27, 2023

Conversation

ganthern
Copy link
Contributor

@ganthern ganthern commented Nov 21, 2023 •
edited
Loading

close #2625
close #6050
also related: #1891

rezbyte and others added 9 commits November 17, 2023 15:16
@rezbyte @ganthern
Update electron & better-sqlite3 & node-gyp
71ce14a 
Updates `node-gyp` to resolve an issue where msvc was falsely flagging
the node API as having syntax errors
@ganthern
update better-sqlite3 to include arm64 target
4f03731
@rezbyte
Fix desktop script building both x86_64 and arm64 at the same time
434c612 
Added a new flag `-a` which allows the developer to set the architecture
of the built client. It causes an error when an unsupported combination
of platform & architecture is used. By default, it uses the architecture
the installed node binary uses.
@rezbyte
Add support for universal architecture on macOS
bb06896 
`electron-builder` has undocumented support for building universal
binaries with `electron/universal`.
It's mentioned in `electron-builder`'s change logs & in
/packages/app-builder-lib/src/macPackager.ts#L109 inside
`electron-builder`'s repo.
@rezbyte
Use Mac M1 agent to build Mac releases during Jenkins build
f809c26
Fix non-universal libraries being included when building universal
a778036
Fix missing entitlement when building universal binary on macOS
0ddf106 
Updated electron-builder and its dependencies.
#2625
Fix type error breaking build on ARM macs
6f4a752 
Type error due to TUTANOTA_MAIL_ADDRESS_DOMAINS not being
`readonly`
@ganthern
Fix build breaking on Linux
7b11fbe 
Removed "dmg-license" which requires the platform to be `darwin`
to be installed. It only should be installed
during the build process.
@rezbyte
Copy link
Contributor

rezbyte commented Nov 21, 2023

I've tested this on macOS Big Sur and it crashes on boot. From the console logs, I suspect another issue with entitlements.
Sandbox: test tuta Mail D(699) deny(1) mach-lookup de.tutao.tutanota-test.MachPortRandezvousServer.1 seems to be the main error. The terminal gives bootstrap_look_up de.tutao.tutanota-test.MachPortRandezvousServer.1: Permission denied (1100).

@rezbyte
Add dmg-license as an optional dependency
d4f3c80 
`dmg-license` is installed by `electron-builder` during the build,
but causes the build to break on Linux & Windows. By adding it to the
optional dependencies it only installs on macOS.
@rezbyte
Copy link
Contributor

rezbyte commented Nov 22, 2023

I looked up the terminal error, 1100 is the Mach error code for BOOTSTRAP_NOT_PRIVILEGED. Just tested the current release version on the older mac and it crashes too. Perhaps the crash is caused by the virtualization.

@rezbyte
Copy link
Contributor

rezbyte commented Nov 22, 2023

Tested it on a newer macOS, it worked fine. Seems there is still a problem with older versions.

@rezbyte
Copy link
Contributor

rezbyte commented Nov 22, 2023

bootstrap_look_up

This issue was introduced by #6050 & not this PR.

update keytar & downgrade electron
3335317 
this is necessary to be able to re-use our keytar build from 3.118.13

#6050
@ganthern ganthern force-pushed the arm-support-2625 branch 3 times, most recently from 4cd5143 to f050e0a Compare November 24, 2023 08:12
@ganthern
Add code to migrate from keytar to safeStorage
6dfab05 
Translated to TypeScript from PR #3742
@ganthern ganthern linked an issue Nov 24, 2023 that may be closed by this pull request
use electron safeStorage #3676
Closed
@ganthern
Copy link
Contributor Author

is this gtg or do we need the lazyMemoized

@ganthern ganthern modified the milestone: 3.119.0 Nov 27, 2023
@ganthern ganthern changed the base branch from master to integration-3.119.0 November 27, 2023 12:44
@ganthern ganthern merged commit 5408751 into integration-3.119.0 Nov 27, 2023
1 check passed
@ganthern ganthern deleted the arm-support-2625 branch November 27, 2023 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charlag charlag charlag left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Segfault on old macOS versions use electron safeStorage Support Apple M1 devices
3 participants
@ganthern @rezbyte @charlag