Skip to content

fix: use wasm2c only for riscv64, loong64 and ppc64le #2

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

Open
kxxt wants to merge 11 commits into
base: feat-add-archs
Choose a base branch
from
Open

fix: use wasm2c only for riscv64, loong64 and ppc64le #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc73ec5
fix: use wasm2c only for riscv64, long64 and ppc64le
kxxt Sep 3, 2026
a84e71e
Revert "fix: switch loong64 to musl"
kxxt Sep 3, 2026
9a4fc79
fix: build cross addon for riscv64, loong64 and ppc64le
kxxt Sep 3, 2026
9435d5d
fix: use edge cross-rs image for loong64
kxxt Sep 3, 2026
b1ac4b3
fix: add npm package placeholders for riscv64, loong64 and ppc64le
kxxt Sep 3, 2026
0616346
fix: add opt deps for riscv64, loong64 andppc64le
kxxt Sep 3, 2026
acff5d5
fix: typo
kxxt Sep 3, 2026
6a452b5
fix: typo
kxxt Sep 3, 2026
a9ff3d8
Reapply "fix: switch loong64 to musl"
kxxt Sep 4, 2026
0c4b994
Revert "Reapply "fix: switch loong64 to musl""
kxxt Sep 4, 2026
5a730f1
fix: handle 127 exit code in test workaround
kxxt Sep 4, 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
18 changes: 11 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,30 +105,34 @@ jobs:
features: '--no-default-features --features "tokio pac-engine pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasm2c"'
use_cross: true
build_cross_addon: true
run_tests: true

- name: linux riscv64
os: ubuntu-latest
target: riscv64gc-unknown-linux-gnu
features: '--no-default-features --features "tokio pac-engine pac-engine-wasmtime pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasmtime"'
features: '--no-default-features --features "tokio pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasm2c"'
use_cross: true
build_cross_addon: true
run_tests: true

- name: linux loong64
os: ubuntu-latest
target: loongarch64-unknown-linux-musl
features: '--no-default-features --features "tokio pac-engine pac-engine-wasmtime pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasmtime"'
target: loongarch64-unknown-linux-gnu
features: '--no-default-features --features "tokio pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasm2c"'
use_cross: true
build_cross_addon: true
run_tests: true

- name: linux ppc64le
os: ubuntu-latest
target: powerpc64le-unknown-linux-gnu
features: '--no-default-features --features "tokio pac-engine pac-engine-wasmtime pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasmtime"'
features: '--no-default-features --features "tokio pac-engine-wasm2c"'
artifact_features: '--no-default-features --features "tokio pac-engine-wasm2c"'
use_cross: true
build_cross_addon: true
run_tests: true

steps:
Expand Down
4 changes: 2 additions & 2 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:0.2.5"
[target.riscv64gc-unknown-linux-gnu]
image = "ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:0.2.5"

[target.loongarch64-unknown-linux-musl]
image = "ghcr.io/cross-rs/loongarch64-unknown-linux-musl:0.2.5"
[target.loongarch64-unknown-linux-gnu]
image = "ghcr.io/cross-rs/loongarch64-unknown-linux-gnu:edge"

[target.powerpc64le-unknown-linux-gnu]
image = "ghcr.io/cross-rs/powerpc64le-unknown-linux-gnu:0.2.5"
2 changes: 1 addition & 1 deletion about.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ targets = [
"aarch64-unknown-linux-musl",
"armv7-unknown-linux-gnueabihf",
"riscv64gc-unknown-linux-gnu",
"loongarch64-unknown-linux-musl",
"loongarch64-unknown-linux-gnu",
"powerpc64le-unknown-linux-gnu",
]

Expand Down
2 changes: 1 addition & 1 deletion deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ targets = [
"aarch64-unknown-linux-musl",
"armv7-unknown-linux-gnueabihf",
"riscv64gc-unknown-linux-gnu",
"loongarch64-unknown-linux-musl",
"loongarch64-unknown-linux-gnu",
"powerpc64le-unknown-linux-gnu",
]
all-features = true
Expand Down
13 changes: 13 additions & 0 deletions npm/platforms/linux-loong64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "@vscodium/os-proxy-resolver-linux-loong64-gnu",
"version": "0.4.0-265898",
"description": "Native binding for @vscodium/os-proxy-resolver on Linux loong64",
"main": "os_proxy_resolver.node",
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
"os": ["linux"],
"cpu": ["loong64"],
"libc": ["glibc"],
"publishConfig": { "access": "public" },
"license": "MIT",
"repository": "github:microsoft/os-proxy-resolver"
}
13 changes: 13 additions & 0 deletions npm/platforms/linux-ppc64le-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "@vscodium/os-proxy-resolver-linux-ppc64le-gnu",
"version": "0.4.0-265898",
"description": "Native binding for @vscodium/os-proxy-resolver on Linux ppc64le",
"main": "os_proxy_resolver.node",
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
"os": ["linux"],
"cpu": ["ppc64le"],
"libc": ["glibc"],
"publishConfig": { "access": "public" },
"license": "MIT",
"repository": "github:microsoft/os-proxy-resolver"
}
13 changes: 13 additions & 0 deletions npm/platforms/linux-riscv64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "@vscodium/os-proxy-resolver-linux-riscv64-gnu",
"version": "0.4.0-265898",
"description": "Native binding for @vscodium/os-proxy-resolver on Linux riscv64",
"main": "os_proxy_resolver.node",
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
"os": ["linux"],
"cpu": ["riscv64"],
"libc": ["glibc"],
"publishConfig": { "access": "public" },
"license": "MIT",
"repository": "github:microsoft/os-proxy-resolver"
}
2 changes: 1 addition & 1 deletion npm/scripts/build-native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const targets = {
'x86_64-unknown-linux-gnu': ['linux-x64-gnu', 'libos_proxy_resolver_node.so'],
'x86_64-unknown-linux-musl': ['linux-x64-musl', 'libos_proxy_resolver_node.so'],
'riscv64gc-unknown-linux-gnu': ['linux-riscv64-gnu', 'libos_proxy_resolver_node.so'],
'loongarch64-unknown-linux-musl': ['linux-loong64-musl', 'libos_proxy_resolver_node.so'],
'loongarch64-unknown-linux-gnu': ['linux-loong64-gnu', 'libos_proxy_resolver_node.so'],
'powerpc64le-unknown-linux-gnu': ['linux-ppc64le-gnu', 'libos_proxy_resolver_node.so'],
'aarch64-pc-windows-msvc': ['win32-arm64-msvc', 'os_proxy_resolver_node.dll'],
'x86_64-pc-windows-msvc': ['win32-x64-msvc', 'os_proxy_resolver_node.dll'],
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"@vscodium/os-proxy-resolver-linux-arm64-musl": "0.4.0-265898",
"@vscodium/os-proxy-resolver-linux-x64-gnu": "0.4.0-265898",
"@vscodium/os-proxy-resolver-linux-x64-musl": "0.4.0-265898",
"@vscodium/os-proxy-resolver-linux-riscv64-gnu": "0.4.0-265898",
"@vscodium/os-proxy-resolver-linux-ppc64le-gnu": "0.4.0-265898",
"@vscodium/os-proxy-resolver-linux-loong64-gnu": "0.4.0-265898",
"@vscodium/os-proxy-resolver-win32-arm64-msvc": "0.4.0-265898",
"@vscodium/os-proxy-resolver-win32-x64-msvc": "0.4.0-265898"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/async_resolution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn async_resolution_worker_processes_second_distinct_request() {
// may fail immediately when executing the foreign binary directly.
// Native jobs still exercise the regression; a deadlocked child is
// distinguished by remaining alive until the deadline below.
if status.code() == Some(2) {
if matches!(status.code(), Some(2) | Some(127)) {
eprintln!("skipping nested subprocess unsupported by this target runner");
return;
}
Expand Down