fix(webkit): properly detect arm64 on apple silicon #4783
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JoelEinbinder
force-pushed
the
fix_x64_downloading
branch
from
595339d
to
ef970f0
Compare
JoelEinbinder
requested review from
dgozman
and removed request for
aslushnikov
|
Is this specific to Node 14? In Node 15 |
yury-s
approved these changes
Dec 21, 2020
src/utils/browserPaths.ts
Outdated
| @@ -35,7 +35,10 @@ export const hostPlatform = ((): BrowserPlatform => { | |||
| const macVersion = execSync('sw_vers -productVersion', { | |||
| stdio: ['ignore', 'pipe', 'ignore'] | |||
| }).toString('utf8').trim().split('.').slice(0, 2).join('.'); | |||
| const archSuffix = os.arch() === 'arm64' ? '-arm64' : ''; | |||
| const arm64 = execSync('sysctl -in hw.optional.arm64', { | |||
There was a problem hiding this comment.
Let's restrain this method to macOS 11+ and Node <15 ?
There was a problem hiding this comment.
Node 15 reports 'x64' unless you compile it yourself.
JoelEinbinder
force-pushed
the
fix_x64_downloading
branch
from
ef970f0
to
6fcdd23
Compare
|
as per discussion with dgozman offline, added a check that doesn't run this code unless you are on macos 11 or higher. |
dgozman
approved these changes
Dec 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
os.arch()returns"x64"on all platforms.uname -ureturnsi386when called from node. Howeversysctltells us the real architecture, even if we are running under Rosetta.Depending on how we merge this into a release, we should also bump the browser number.