diff --git a/.devcontainer/finalize.sh b/.devcontainer/finalize.sh index abbb67697..7ae6c6b4b 100644 --- a/.devcontainer/finalize.sh +++ b/.devcontainer/finalize.sh @@ -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" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23debb49b..b40b72917 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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. @@ -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 diff --git a/crates/test-rust-wasm/artifacts/build.rs b/crates/test-rust-wasm/artifacts/build.rs index bc8ca771a..ba41a22c5 100644 --- a/crates/test-rust-wasm/artifacts/build.rs +++ b/crates/test-rust-wasm/artifacts/build.rs @@ -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; diff --git a/tests/README.md b/tests/README.md index fccf9b523..cc5f2f9d8 100644 --- a/tests/README.md +++ b/tests/README.md @@ -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)