Skip to content

Commit d8f9120

Browse files
alexcrichtonAmanieu
authored andcommitted
Update to wasm32-wasip1-based testing
This commit is a replacement for #1417 now that rust-lang/rust#12046 has landed. While I was here I went ahead and updated the Wasmtime used in CI and adapted its command line as well.
1 parent 6d0479d commit d8f9120

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
#- mips64el-unknown-linux-gnuabi64
8282
#- mipsel-unknown-linux-musl
8383
- s390x-unknown-linux-gnu
84-
- wasm32-wasi
84+
- wasm32-wasip1
8585
- i586-unknown-linux-gnu
8686
- nvptx64-nvidia-cuda
8787
- thumbv6m-none-eabi
@@ -135,7 +135,7 @@ jobs:
135135
disable_assert_instr: true
136136
- target: s390x-unknown-linux-gnu
137137
os: ubuntu-latest
138-
- target: wasm32-wasi
138+
- target: wasm32-wasip1
139139
os: ubuntu-latest
140140
- target: aarch64-apple-darwin
141141
os: macos-latest

ci/docker/wasm32-wasi/Dockerfile

-16
This file was deleted.

ci/docker/wasm32-wasip1/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM ubuntu:20.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update -y && apt-get install -y --no-install-recommends \
5+
ca-certificates \
6+
curl \
7+
xz-utils \
8+
clang
9+
10+
RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasmtime-v18.0.2-x86_64-linux.tar.xz | tar xJf -
11+
ENV PATH=$PATH:/wasmtime-v18.0.2-x86_64-linux
12+
13+
ENV CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime --dir /checkout/target/wasm32-wasip1/release/deps::."

0 commit comments

Comments
 (0)