diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a7617c63..de132e8ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,9 +79,11 @@ jobs: sparcv9-sun-solaris aarch64-linux-android aarch64-apple-ios - wasm32-wasi - if: matrix.rust != '1.63' - run: rustup target add x86_64-unknown-fuchsia + run: > + rustup target add + wasm32-wasip1 + x86_64-unknown-fuchsia - if: matrix.rust == '1.63' run: rustup target add x86_64-fuchsia @@ -98,6 +100,8 @@ jobs: - run: cargo check --workspace --release -vv --target=x86_64-apple-darwin --features=all-apis --all-targets - run: cargo check --workspace --release -vv --target=x86_64-unknown-freebsd --features=all-apis --all-targets - run: cargo check --workspace --release -vv --target=x86_64-unknown-netbsd --features=all-apis --all-targets + - if: matrix.rust != '1.63' + run: cargo check --workspace --release -vv --target=wasm32-wasip1 --features=all-apis - if: matrix.rust != '1.63' run: cargo check --workspace --release -vv --target=x86_64-unknown-fuchsia --features=all-apis --all-targets - if: matrix.rust == '1.63' @@ -121,7 +125,6 @@ jobs: - run: cargo check --workspace --release -vv --target=sparcv9-sun-solaris --features=all-apis --all-targets - run: cargo check --workspace --release -vv --target=aarch64-apple-ios --features=all-apis --all-targets - run: cargo check --workspace --release -vv --target=aarch64-linux-android --features=all-apis --all-targets - - run: cargo check --workspace --release -vv --target=wasm32-wasi --features=all-apis check_no_default_features: name: Check --no-default-features @@ -176,10 +179,10 @@ jobs: - run: > rustup target add x86_64-unknown-redox - wasm32-wasi + wasm32-wasip1 thumbv7neon-unknown-linux-gnueabihf - run: cargo check --workspace --release -vv --target=x86_64-unknown-redox --features=all-apis - - run: cargo check --workspace --release -vv --target=wasm32-wasi --features=all-apis + - run: cargo check --workspace --release -vv --target=wasm32-wasip1 --features=all-apis - run: cargo check --workspace --release -vv --target=thumbv7neon-unknown-linux-gnueabihf --features=all-apis check_tier3: diff --git a/.github/workflows/test-users.yml b/.github/workflows/test-users.yml index f86eaa71d..68293cafd 100644 --- a/.github/workflows/test-users.yml +++ b/.github/workflows/test-users.yml @@ -1618,7 +1618,7 @@ jobs: ref: rustix-0.35.6-beta.2 submodules: true - - run: rustup target add wasm32-wasi + - run: rustup target add wasm32-wasip1 - run: cd wasmtime && cargo update - run: sed -i'.bak' 's/^version = "'`cd wasmtime && cargo tree --edges=normal |head -1 |sed 's/^[[:alnum:]_-]* v\([[:alnum:].-]*\) (.*/\1/'`'"$/version = '`grep -A1 '^name = "rustix"' wasmtime/Cargo.lock |grep ^version |sed 's/^[^"]*//'`'/' Cargo.toml - run: cd wasmtime && echo '[patch.crates-io]' >> Cargo.toml diff --git a/Cargo.toml b/Cargo.toml index 0204a47d8..fbda86c5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,7 +105,7 @@ targets = [ "x86_64-unknown-redox", "x86_64-unknown-haiku", "wasm32-unknown-emscripten", - "wasm32-wasi", + "wasm32-wasip1", ] [features]