Skip to content

Commit 57cdd9f

Browse files
bjorn3folkertdev
authored andcommitted
Run test-libz-rs-sys tests on wasm in CI
1 parent 45cebbe commit 57cdd9f

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/checks.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,21 +312,30 @@ jobs:
312312
uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
313313
with:
314314
toolchain: "stable"
315-
targets: "wasm32-wasi"
315+
targets: "wasm32-wasip1"
316316
- name: target
317317
run: "rustc -vV | sed -n 's|host: ||p'"
318318
- name: Install cargo-nextest
319319
uses: taiki-e/install-action@56ab7930c591507f833cbaed864d201386d518a8
320320
with:
321321
tool: cargo-nextest
322+
- name: Download wasi-sdk
323+
run: |
324+
curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sdk-24.0-x86_64-linux.tar.gz | tar xz
322325
- name: cargo nextest (without SIMD)
323-
run: cargo nextest run -p zlib-rs --target wasm32-wasi
326+
run: |
327+
export CMAKE_TOOLCHAIN_FILE="$(pwd)/wasi-sdk-24.0-x86_64-linux/share/cmake/wasi-sdk.cmake"
328+
cargo nextest run -p zlib-rs -p test-libz-rs-sys --target wasm32-wasip1
324329
env:
330+
CFLAGS: "-fno-pic" # workaround for linker bug (WebAssembly/wasi-sdk#492)
325331
RUST_BACKTRACE: 1
326332
RUSTFLAGS: ""
327333
- name: cargo nextest (with SIMD)
328-
run: cargo nextest run -p zlib-rs --target wasm32-wasi
334+
run: |
335+
export CMAKE_TOOLCHAIN_FILE="$(pwd)/wasi-sdk-24.0-x86_64-linux/share/cmake/wasi-sdk.cmake"
336+
cargo nextest run -p zlib-rs -p test-libz-rs-sys --target wasm32-wasip1
329337
env:
338+
CFLAGS: "-fno-pic" # workaround for linker bug (WebAssembly/wasi-sdk#492)
330339
RUST_BACKTRACE: 1
331340
RUSTFLAGS: "-Ctarget-feature=+simd128"
332341

qemu-cargo-config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ linker = "s390x-linux-gnu-gcc"
77
[target.i686-unknown-linux-gnu]
88
linker = "i686-linux-gnu-gcc"
99

10-
[target.wasm32-wasi]
10+
[target.wasm32-wasip1]
1111
runner = "/home/runner/.wasmtime/bin/wasmtime"

0 commit comments

Comments
 (0)