Skip to content

Update polserver to 2ef63ff #130

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.

Sign up for GitHub

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

Merged
KevinEady merged 5 commits into from
Sep 22, 2026
Merged

Update polserver to 2ef63ff #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d8af2f
Update polserver to e216579
KevinEady Sep 21, 2026
1b19a30
Update cmake-js to 8.0.0
KevinEady Sep 21, 2026
4fafdeb
Update failed tests due to upstream uo.em changes
KevinEady Sep 21, 2026
1d671ba
Remove universal builds from osx
KevinEady Sep 21, 2026
c27977b
Update polserver to 2ef63ff
KevinEady Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ jobs:
- name: Upload Extension Artifact
uses: actions/upload-artifact@v4
with:
name: vscode-escript-native.darwin-universal
path: native/build/Release/vscode-escript-native.darwin-universal.node
name: vscode-escript-native.darwin-arm64
path: native/build/Release/vscode-escript-native.darwin-arm64.node

package:
name: Package
Expand Down Expand Up @@ -157,10 +157,10 @@ jobs:

- run: npm install

- name: Download Temporary Artifact darwin-universal
- name: Download Temporary Artifact darwin-arm64
uses: actions/download-artifact@v4
with:
name: vscode-escript-native.darwin-universal
name: vscode-escript-native.darwin-arm64
path: native/build/Release

- name: Download Temporary Artifact win32-x64
Expand All @@ -180,13 +180,13 @@ jobs:
- name: Upload Extension Artifact
uses: actions/upload-artifact@v4
with:
name: escript-lsp-universal
name: vscode-escript
path: escript-lsp-*.vsix

- name: Delete Temporary Artifact darwin-universal
- name: Delete Temporary Artifact darwin-arm64
uses: geekyeggo/delete-artifact@v5
with:
name: vscode-escript-native.darwin-universal
name: vscode-escript-native.darwin-arm64

- name: Delete Temporary Artifact win32-x64
uses: geekyeggo/delete-artifact@v5
Expand Down
11 changes: 1 addition & 10 deletions native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ else()
set(PLATFORM linux)
endif()

if(APPLE AND NOT DEFINED ENV{BUILD_OSX_SLIM_BINARY})
message("** Building universal macOS binary")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
set(BUILD_OSX_UNIVERSAL_BINARY TRUE)
set(PIPED_OSX_ARCHITECTURES "arm64|x86_64") # For ExternalProject
endif()

if(BUILD_OSX_UNIVERSAL_BINARY)
set(ARCH universal)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*|aarch64)")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*|aarch64)")
set(ARCH arm64)
else()
set(ARCH x64)
Expand Down
Loading
Loading