-
Notifications
You must be signed in to change notification settings - Fork 27.9k
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
Add support for arm64 for server builds #145053
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
bd9d4d5
Add support for arm64 for server builds
alexdima 9ea977e
Fix paths
alexdima ed0cb70
Don't run certain steps in the universal build
alexdima 8070d2a
Add mapping for server darwin arm64
alexdima a537cdb
update `.js`
alexdima c80ad9b
Keep legacy zip file names for darwin x64
alexdima File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ const yarnrc = fs.readFileSync(yarnrcPath, 'utf8'); | |
const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1]; | ||
|
||
const platform = process.platform; | ||
const arch = platform === 'darwin' ? 'x64' : process.arch; | ||
const arch = process.arch; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🤌😙 |
||
|
||
const node = platform === 'win32' ? 'node.exe' : 'node'; | ||
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node); | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alexdima why duplicate these steps for each artifact over the previous version based on
vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
andscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried to keep compatibility with the old names:
x64
versions are still calledvscode-server-darwin.zip
andvscode-server-darwin-web.zip
arm64
versions are calledvscode-server-darwin-arm64.zip
andvscode-server-darwin-arm64-web.zip
I didn't know how to write a conditional inside the
publish:
field. If you know how to do it, please start a PR to remove the duplication.