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.

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

Prevent install of x86 app on arm64 Windows, and vice versa #7149

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

dlon
Copy link
Member

@dlon dlon commented Nov 8, 2024

Since there is currently a separate build for ARM Windows.

Close DES-187.


This change is Reviewable

@dlon dlon changed the title Prevent install of x86 app on arm64 Windows Prevent install of x86 app on arm64 Windows, and vice versa Nov 8, 2024
@dlon dlon requested a review from hulthe November 8, 2024 10:29
@dlon dlon marked this pull request as ready for review November 8, 2024 10:30
Copy link
Contributor

@hulthe hulthe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed all commit messages.
Reviewable status: 0 of 2 files reviewed, 1 unresolved discussion (waiting on @dlon)


dist-assets/windows/installer.nsh line 697 at r1 (raw file):

		StrCpy $NativeTarget "x64"
	${ElseIf} ${IsNativeARM64}
		StrCpy $NativeTarget "ARM64"

is this intended to line up with https://www.electron.build/builder-util.typealias.archtype ?

If so, that should be documented. Also, shouldn't it be "arm64" (lower case)?

Copy link
Member Author

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r2.
Reviewable status: 0 of 2 files reviewed, 1 unresolved discussion (waiting on @hulthe)


dist-assets/windows/installer.nsh line 697 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

is this intended to line up with https://www.electron.build/builder-util.typealias.archtype ?

If so, that should be documented. Also, shouldn't it be "arm64" (lower case)?

Done and done.

Copy link
Contributor

@hulthe hulthe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, assuming it's been tested on arm and intel

Reviewed 1 of 2 files at r1, 1 of 1 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants