Skip to content

Commit c9d06b2

Browse files
joshtriplettsunfishcode
authored andcommitted
Migrate from wasm32-wasi (no longer exists on nightly) to wasm32-wasip1 (#1210)
1 parent 8c50519 commit c9d06b2

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Diff for: .github/workflows/main.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,11 @@ jobs:
7979
sparcv9-sun-solaris
8080
aarch64-linux-android
8181
aarch64-apple-ios
82-
wasm32-wasi
8382
- if: matrix.rust != '1.63'
84-
run: rustup target add x86_64-unknown-fuchsia
83+
run: >
84+
rustup target add
85+
wasm32-wasip1
86+
x86_64-unknown-fuchsia
8587
- if: matrix.rust == '1.63'
8688
run: rustup target add x86_64-fuchsia
8789

@@ -98,6 +100,8 @@ jobs:
98100
- run: cargo check --workspace --release -vv --target=x86_64-apple-darwin --features=all-apis --all-targets
99101
- run: cargo check --workspace --release -vv --target=x86_64-unknown-freebsd --features=all-apis --all-targets
100102
- run: cargo check --workspace --release -vv --target=x86_64-unknown-netbsd --features=all-apis --all-targets
103+
- if: matrix.rust != '1.63'
104+
run: cargo check --workspace --release -vv --target=wasm32-wasip1 --features=all-apis
101105
- if: matrix.rust != '1.63'
102106
run: cargo check --workspace --release -vv --target=x86_64-unknown-fuchsia --features=all-apis --all-targets
103107
- if: matrix.rust == '1.63'
@@ -121,7 +125,6 @@ jobs:
121125
- run: cargo check --workspace --release -vv --target=sparcv9-sun-solaris --features=all-apis --all-targets
122126
- run: cargo check --workspace --release -vv --target=aarch64-apple-ios --features=all-apis --all-targets
123127
- run: cargo check --workspace --release -vv --target=aarch64-linux-android --features=all-apis --all-targets
124-
- run: cargo check --workspace --release -vv --target=wasm32-wasi --features=all-apis
125128

126129
check_no_default_features:
127130
name: Check --no-default-features
@@ -176,10 +179,10 @@ jobs:
176179
- run: >
177180
rustup target add
178181
x86_64-unknown-redox
179-
wasm32-wasi
182+
wasm32-wasip1
180183
thumbv7neon-unknown-linux-gnueabihf
181184
- run: cargo check --workspace --release -vv --target=x86_64-unknown-redox --features=all-apis
182-
- run: cargo check --workspace --release -vv --target=wasm32-wasi --features=all-apis
185+
- run: cargo check --workspace --release -vv --target=wasm32-wasip1 --features=all-apis
183186
- run: cargo check --workspace --release -vv --target=thumbv7neon-unknown-linux-gnueabihf --features=all-apis
184187

185188
check_tier3:

Diff for: .github/workflows/test-users.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ jobs:
16181618
ref: rustix-0.35.6-beta.2
16191619
submodules: true
16201620

1621-
- run: rustup target add wasm32-wasi
1621+
- run: rustup target add wasm32-wasip1
16221622
- run: cd wasmtime && cargo update
16231623
- 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
16241624
- run: cd wasmtime && echo '[patch.crates-io]' >> Cargo.toml

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ targets = [
105105
"x86_64-unknown-redox",
106106
"x86_64-unknown-haiku",
107107
"wasm32-unknown-emscripten",
108-
"wasm32-wasi",
108+
"wasm32-wasip1",
109109
]
110110

111111
[features]

0 commit comments

Comments
 (0)