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

Add support for arm64 for server builds #145053

Merged
merged 6 commits into from Mar 16, 2022
Merged

Conversation

alexdima
Copy link
Member

@alexdima alexdima commented Mar 14, 2022

@alexdima alexdima added this to the March 2022 milestone Mar 14, 2022
@alexdima alexdima self-assigned this Mar 14, 2022
@@ -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;
Copy link
Member

Choose a reason for hiding this comment

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

🤌😙

@alexdima alexdima merged commit 6262914 into main Mar 16, 2022
@alexdima alexdima deleted the alex/server-darwin-arm64 branch March 16, 2022 11:54
Comment on lines +317 to +335
- publish: $(Agent.BuildDirectory)/vscode-server-darwin-arm64.zip
artifact: vscode_server_darwin_arm64_archive-unsigned
displayName: Publish arm64 server archive
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'arm64'))

- publish: $(Agent.BuildDirectory)/vscode-server-darwin-arm64-web.zip
artifact: vscode_web_darwin_arm64_archive-unsigned
displayName: Publish arm64 web server archive
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'arm64'))

- publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
displayName: Publish server archive
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
artifact: vscode_server_darwin_x64_archive-unsigned
displayName: Publish x64 server archive
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))

- publish: $(Agent.BuildDirectory)/vscode-server-darwin-web.zip
artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
displayName: Publish web server archive
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
artifact: vscode_web_darwin_x64_archive-unsigned
displayName: Publish x64 web server archive
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))
Copy link
Contributor

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 and scode_server_darwin_$(VSCODE_ARCH)_archive-unsigned ?

Copy link
Member Author

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:

  • the x64 versions are still called vscode-server-darwin.zip and vscode-server-darwin-web.zip
  • the arm64 versions are called vscode-server-darwin-arm64.zip and vscode-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.

@github-actions github-actions bot locked and limited conversation to collaborators Apr 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants