diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10bb8eb..383329f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/Cross.toml b/Cross.toml index 7b9c938..c85a623 100644 --- a/Cross.toml +++ b/Cross.toml @@ -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" \ No newline at end of file diff --git a/about.toml b/about.toml index f461135..cc98aca 100644 --- a/about.toml +++ b/about.toml @@ -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", ] diff --git a/deny.toml b/deny.toml index 7eaa0df..a76d7f0 100644 --- a/deny.toml +++ b/deny.toml @@ -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 diff --git a/npm/platforms/linux-loong64-gnu/package.json b/npm/platforms/linux-loong64-gnu/package.json new file mode 100644 index 0000000..e625032 --- /dev/null +++ b/npm/platforms/linux-loong64-gnu/package.json @@ -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" +} \ No newline at end of file diff --git a/npm/platforms/linux-ppc64le-gnu/package.json b/npm/platforms/linux-ppc64le-gnu/package.json new file mode 100644 index 0000000..c7054fd --- /dev/null +++ b/npm/platforms/linux-ppc64le-gnu/package.json @@ -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" +} \ No newline at end of file diff --git a/npm/platforms/linux-riscv64-gnu/package.json b/npm/platforms/linux-riscv64-gnu/package.json new file mode 100644 index 0000000..ccc41e8 --- /dev/null +++ b/npm/platforms/linux-riscv64-gnu/package.json @@ -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" +} \ No newline at end of file diff --git a/npm/scripts/build-native.js b/npm/scripts/build-native.js index 1a6e649..3ec5b26 100644 --- a/npm/scripts/build-native.js +++ b/npm/scripts/build-native.js @@ -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'], diff --git a/package.json b/package.json index 307718f..c8dca45 100644 --- a/package.json +++ b/package.json @@ -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" } diff --git a/tests/async_resolution.rs b/tests/async_resolution.rs index 224ffb4..93177ea 100644 --- a/tests/async_resolution.rs +++ b/tests/async_resolution.rs @@ -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; }