Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/finalize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ printf "Installing Rust Targets\n"
rustup update stable --no-self-update
rustup default stable
rustup target add wasm32-unknown-unknown
rustup target add wasm32-wasi
rustup target add wasm32-wasip1

# Install Python stuff
printf "Installing Python Dependencies"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ jobs:
run: rustup update stable --no-self-update && rustup default stable
- name: Install wasm32-unknown-unknown target
run: rustup target add wasm32-unknown-unknown
- name: Install wasm32-wasi target
run: rustup target add wasm32-wasi
- name: Install wasm32-wasip1 target
run: rustup target add wasm32-wasip1

- uses: ./.github/actions/install-wasi-sdk

Expand Down Expand Up @@ -118,8 +118,8 @@ jobs:
run: rustup update stable --no-self-update && rustup default stable
- name: Install wasm32-unknown-unknown target
run: rustup target add wasm32-unknown-unknown
- name: Install wasm32-wasi target
run: rustup target add wasm32-wasi
- name: Install wasm32-wasip1 target
run: rustup target add wasm32-wasip1

# Verify the output of the `./ci/rebuild-libcabi-realloc.sh` script is
# up-to-date.
Expand All @@ -138,10 +138,10 @@ jobs:
- run: cargo build --no-default-features --features markdown

# Feature combos of the `wit-bindgen` crate
- run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features
- run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features realloc
- run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features macros
- run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features macros,realloc
- run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features
- run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features --features realloc
- run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features --features macros
- run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features --features macros,realloc

# Verity that documentation can be generated for the rust bindings crate.
- run: cargo doc -p wit-bindgen --no-deps
Expand Down
4 changes: 2 additions & 2 deletions crates/test-rust-wasm/artifacts/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ fn main() {
let mut cmd = Command::new("cargo");
cmd.arg("build")
.current_dir("../../test-rust-wasm")
.arg("--target=wasm32-wasi")
.arg("--target=wasm32-wasip1")
.env("CARGO_TARGET_DIR", &out_dir)
.env("CARGO_PROFILE_DEV_DEBUG", "1");
let status = cmd.status().unwrap();
assert!(status.success());

let mut wasms = Vec::new();
for file in out_dir.join("wasm32-wasi/debug").read_dir().unwrap() {
for file in out_dir.join("wasm32-wasip1/debug").read_dir().unwrap() {
let file = file.unwrap().path();
if file.extension().and_then(|s| s.to_str()) != Some("wasm") {
continue;
Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ There are a few pre-requisites to testing the project. You only need the languag
- Create an environment variable called `WASI_SDK_PATH`` giving the path where you extracted the WASI SDK download, i.e., the directory containing `bin`/`lib`/`share`` folders.
- Compilers for the target language:
- Go + TinyGo - https://tinygo.org/ (v0.27.0+)
- Rust - wasi target: `rustup target add wasm32-wasi`
- Rust - wasi target: `rustup target add wasm32-wasip1`
- Java - TeaVM-WASI `ci/download-teamvm.sh`
- C - [Clang](https://clang.llvm.org/)
- C# - [Dotnet 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
Expand Down
Loading