Skip to content

Commit dd869e1

Browse files
committed
Fix binary server startup on MacOS aarch64.
- Fix pre-release builds to publish "latest" binaries Signed-off-by: Roland Grunberg <[email protected]>
1 parent 4549a37 commit dd869e1

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,17 @@ jobs:
153153
name: lemminx-uber-jar
154154
path: server/org.eclipse.lemminx*-uber.jar
155155
if-no-files-found: error
156+
- name: Publish to GH Pre-Release Tab
157+
if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true' }}
158+
uses: "marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0"
159+
with:
160+
repo_token: "${{ secrets.GITHUB_TOKEN }}"
161+
automatic_release_tag: "latest"
162+
prerelease: true
163+
title: "Development Build"
164+
files: |
165+
../staging/zips/lemminx-*
166+
../staging/checksums/lemminx-*
156167
- name: Publish to GH Release Tab
157168
if: ${{ inputs.publishToMarketPlace == 'true' && inputs.publishToOVSX == 'true' }}
158169
uses: "marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0"

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"binaryServerDownloadUrl": {
2828
"linux": "https://github.com/redhat-developer/vscode-xml/releases/download/latest/lemminx-linux.zip",
2929
"osx-x86_64": "https://github.com/redhat-developer/vscode-xml/releases/download/latest/lemminx-osx-x86_64.zip",
30+
"osx-aarch_64": "https://github.com/redhat-developer/vscode-xml/releases/download/latest/lemminx-osx-aarch_64.zip",
3031
"win32": "https://github.com/redhat-developer/vscode-xml/releases/download/latest/lemminx-win32.zip"
3132
},
3233
"capabilities": {

src/server/binary/binaryServerStarter.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,12 @@ function getBinaryEnvironment(): any {
214214
function getServerBinaryNameWithoutExtension(): string {
215215
switch (os.platform()) {
216216
case 'darwin':
217-
// FIXME: once we support Apple ARM, incorporate the architecture into this string
218-
return 'lemminx-osx-x86_64';
217+
switch (os.arch()) {
218+
case 'arm64':
219+
return 'lemminx-osx-aarch_64';
220+
default:
221+
return 'lemminx-osx-x86_64';
222+
}
219223
default:
220224
return `lemminx-${os.platform}`;
221225
}

0 commit comments

Comments
 (0)