Skip to content

Commit 76f81aa

Browse files
committed
Use wasm32-wasip1 target.
Note that @rules_rust//rust/platform:wasi evaluates to wasm32-wasi, and there is no platform defined for wasm32-wasip1, so this doesn't change anything for Bazel builds. Signed-off-by: Piotr Sikora <[email protected]>
1 parent 3f4274e commit 76f81aa

File tree

13 files changed

+41
-41
lines changed

13 files changed

+41
-41
lines changed

.github/workflows/rust.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- name: Build (wasm32-unknown-unknown)
7474
run: bazelisk --noworkspace_rc build --noenable_bzlmod --platforms=@rules_rust//rust/platform:wasm //...
7575

76-
- name: Build (wasm32-wasi)
76+
- name: Build (wasm32-wasip1)
7777
run: bazelisk --noworkspace_rc build --noenable_bzlmod --platforms=@rules_rust//rust/platform:wasi //...
7878

7979
- name: Format (buildifier)
@@ -111,19 +111,19 @@ jobs:
111111
rustup toolchain install 1.64.0 --component clippy --component rustfmt
112112
rustup default 1.64.0
113113
rustup target add wasm32-unknown-unknown
114-
rustup target add wasm32-wasi
114+
rustup target add wasm32-wasip1
115115
116116
- name: Build (wasm32-unknown-unknown)
117117
run: cargo build --release --all-targets --target=wasm32-unknown-unknown
118118

119119
- name: Clippy (wasm32-unknown-unknown)
120120
run: cargo clippy --release --all-targets --target=wasm32-unknown-unknown
121121

122-
- name: Build (wasm32-wasi)
123-
run: cargo build --release --all-targets --target=wasm32-wasi
122+
- name: Build (wasm32-wasip1)
123+
run: cargo build --release --all-targets --target=wasm32-wasip1
124124

125-
- name: Clippy (wasm32-wasi)
126-
run: cargo clippy --release --all-targets --target=wasm32-wasi
125+
- name: Clippy (wasm32-wasip1)
126+
run: cargo clippy --release --all-targets --target=wasm32-wasip1
127127

128128
- name: Format (rustfmt)
129129
run: cargo fmt -- --check
@@ -159,19 +159,19 @@ jobs:
159159
run: |
160160
rustup toolchain install stable --component clippy --component rustfmt
161161
rustup target add wasm32-unknown-unknown
162-
rustup target add wasm32-wasi
162+
rustup target add wasm32-wasip1
163163
164164
- name: Build (wasm32-unknown-unknown)
165165
run: cargo build --release --all-targets --target=wasm32-unknown-unknown
166166

167167
- name: Clippy (wasm32-unknown-unknown)
168168
run: cargo clippy --release --all-targets --target=wasm32-unknown-unknown
169169

170-
- name: Build (wasm32-wasi)
171-
run: cargo build --release --all-targets --target=wasm32-wasi
170+
- name: Build (wasm32-wasip1)
171+
run: cargo build --release --all-targets --target=wasm32-wasip1
172172

173-
- name: Clippy (wasm32-wasi)
174-
run: cargo clippy --release --all-targets --target=wasm32-wasi
173+
- name: Clippy (wasm32-wasip1)
174+
run: cargo clippy --release --all-targets --target=wasm32-wasip1
175175

176176
- name: Format (rustfmt)
177177
run: cargo fmt -- --check
@@ -208,19 +208,19 @@ jobs:
208208
rustup toolchain install nightly --component clippy --component rustfmt
209209
rustup default nightly
210210
rustup target add wasm32-unknown-unknown
211-
rustup target add wasm32-wasi
211+
rustup target add wasm32-wasip1
212212
213213
- name: Build (wasm32-unknown-unknown)
214214
run: cargo build --release --all-targets --target=wasm32-unknown-unknown
215215

216216
- name: Clippy (wasm32-unknown-unknown)
217217
run: cargo clippy --release --all-targets --target=wasm32-unknown-unknown
218218

219-
- name: Build (wasm32-wasi)
220-
run: cargo build --release --all-targets --target=wasm32-wasi
219+
- name: Build (wasm32-wasip1)
220+
run: cargo build --release --all-targets --target=wasm32-wasip1
221221

222-
- name: Clippy (wasm32-wasi)
223-
run: cargo clippy --release --all-targets --target=wasm32-wasi
222+
- name: Clippy (wasm32-wasip1)
223+
run: cargo clippy --release --all-targets --target=wasm32-wasip1
224224

225225
- name: Format (rustfmt)
226226
run: cargo fmt -- --check
@@ -311,13 +311,13 @@ jobs:
311311
- name: Update Rust
312312
run: |
313313
rustup toolchain install stable --component clippy --component rustfmt
314-
rustup target add wasm32-wasi
314+
rustup target add wasm32-wasip1
315315
316-
- name: Build (wasm32-wasi)
317-
run: cargo build --release --target=wasm32-wasi
316+
- name: Build (wasm32-wasip1)
317+
run: cargo build --release --target=wasm32-wasip1
318318

319-
- name: Clippy (wasm32-wasi)
320-
run: cargo clippy --release --target=wasm32-wasi
319+
- name: Clippy (wasm32-wasip1)
320+
run: cargo clippy --release --target=wasm32-wasip1
321321

322322
- name: Format (rustfmt)
323323
run: cargo fmt -- --check
@@ -335,7 +335,7 @@ jobs:
335335
run: |
336336
docker run --rm \
337337
-v $(pwd)/envoy.yaml:/envoy.yaml \
338-
-v $(pwd)/target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins \
338+
-v $(pwd)/target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins \
339339
envoyproxy/envoy:v1.31-latest \
340340
--mode validate \
341341
-c envoy.yaml
@@ -375,20 +375,20 @@ jobs:
375375
- name: Update Rust
376376
run: |
377377
rustup toolchain install nightly --component clippy --component rustfmt
378-
rustup +nightly target add wasm32-wasi
379378
rustup default nightly
379+
rustup target add wasm32-wasip1
380380
381381
- name: Change crate type from library to binary
382382
run: |
383383
grep -v '^\[lib\]' Cargo.toml > Cargo.tmp
384384
grep -v '^crate-type' Cargo.tmp > Cargo.toml
385385
mv src/lib.rs src/main.rs
386386
387-
- name: Build (wasm32-wasi)
388-
run: cargo build --release --target=wasm32-wasi
387+
- name: Build (wasm32-wasip1)
388+
run: cargo build --release --target=wasm32-wasip1
389389

390-
- name: Clippy (wasm32-wasi)
391-
run: cargo clippy --release --target=wasm32-wasi
390+
- name: Clippy (wasm32-wasip1)
391+
run: cargo clippy --release --target=wasm32-wasip1
392392

393393
- name: Format (rustfmt)
394394
run: cargo fmt -- --check
@@ -404,7 +404,7 @@ jobs:
404404

405405
- name: Rename .wasm to match expected filename
406406
run: |
407-
cd target/wasm32-wasi/release
407+
cd target/wasm32-wasip1/release
408408
for file in $(ls -1 *.wasm); do \
409409
mv $file $(echo $file | sed 's/-/_/g'); \
410410
done
@@ -413,7 +413,7 @@ jobs:
413413
run: |
414414
docker run --rm \
415415
-v $(pwd)/envoy.yaml:/envoy.yaml \
416-
-v $(pwd)/target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins \
416+
-v $(pwd)/target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins \
417417
envoyproxy/envoy:v1.31-latest \
418418
--mode validate \
419419
-c envoy.yaml

examples/grpc_auth_random/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Proxy-Wasm plugin that grants access based on a result of gRPC callout.
55
### Building
66

77
```sh
8-
$ cargo build --target wasm32-wasi --release
8+
$ cargo build --target wasm32-wasip1 --release
99
```
1010

1111
### Using in Envoy

examples/grpc_auth_random/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- "10000:10000"
2121
volumes:
2222
- ./envoy.yaml:/etc/envoy/envoy.yaml
23-
- ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins
23+
- ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins
2424
networks:
2525
- envoymesh
2626
depends_on:

examples/hello_world/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Proxy-Wasm background service plugin that logs time and random numbers.
55
### Building
66

77
```sh
8-
$ cargo build --target wasm32-wasi --release
8+
$ cargo build --target wasm32-wasip1 --release
99
```
1010

1111
### Using in Envoy

examples/hello_world/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- "10000:10000"
2121
volumes:
2222
- ./envoy.yaml:/etc/envoy/envoy.yaml
23-
- ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins
23+
- ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins
2424
networks:
2525
- envoymesh
2626
networks:

examples/http_auth_random/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Proxy-Wasm plugin that grants access based on a result of HTTP callout.
55
### Building
66

77
```sh
8-
$ cargo build --target wasm32-wasi --release
8+
$ cargo build --target wasm32-wasip1 --release
99
```
1010

1111
### Using in Envoy

examples/http_auth_random/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- "10000:10000"
2121
volumes:
2222
- ./envoy.yaml:/etc/envoy/envoy.yaml
23-
- ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins
23+
- ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins
2424
networks:
2525
- envoymesh
2626
depends_on:

examples/http_body/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Proxy-Wasm plugin that redacts sensitive HTTP responses.
55
### Building
66

77
```sh
8-
$ cargo build --target wasm32-wasi --release
8+
$ cargo build --target wasm32-wasip1 --release
99
```
1010

1111
### Using in Envoy

examples/http_body/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- "10000:10000"
2121
volumes:
2222
- ./envoy.yaml:/etc/envoy/envoy.yaml
23-
- ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins
23+
- ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins
2424
networks:
2525
- envoymesh
2626
networks:

examples/http_config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Proxy-Wasm plugin that injects HTTP response header with a value from Envoy conf
55
### Building
66

77
```sh
8-
$ cargo build --target wasm32-wasi --release
8+
$ cargo build --target wasm32-wasip1 --release
99
```
1010

1111
### Using in Envoy

0 commit comments

Comments
 (0)