Skip to content

Commit 24d06a9

Browse files
committed
Add CI tests for wasip2
1 parent 692935b commit 24d06a9

File tree

3 files changed

+52
-38
lines changed

3 files changed

+52
-38
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,29 @@ jobs:
1010
build:
1111
name: Build
1212
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
include:
16+
- target: wasm32-unknown-unknown
17+
- target: wasm32-wasip2
1318
steps:
1419
- name: Checkout sources
1520
uses: actions/checkout@v3
16-
- name: Install Rust
17-
uses: actions-rs/toolchain@v1
18-
with:
19-
profile: minimal
20-
toolchain: stable
21-
target: wasm32-unknown-unknown
21+
- name: Install Rust from rust-toolchain.toml
22+
uses: actions-rust-lang/setup-rust-toolchain@v1
2223
- name: Build
2324
uses: actions-rs/cargo@v1
2425
with:
2526
command: build
26-
args: --target wasm32-unknown-unknown
27+
args: --target ${{ matrix.target }}
2728
fmt:
2829
name: Format Check
2930
runs-on: ubuntu-latest
3031
steps:
3132
- name: Checkout sources
3233
uses: actions/checkout@v3
33-
- name: Install Rust
34-
uses: actions-rs/toolchain@v1
35-
with:
36-
profile: minimal
37-
toolchain: stable
38-
components: rustfmt
39-
target: wasm32-unknown-unknown
34+
- name: Install Rust from rust-toolchain.toml
35+
uses: actions-rust-lang/setup-rust-toolchain@v1
4036
- name: Run cargo fmt
4137
uses: actions-rs/cargo@v1
4238
with:
@@ -45,18 +41,18 @@ jobs:
4541
clippy:
4642
name: Clippy Check
4743
runs-on: ubuntu-latest
44+
strategy:
45+
matrix:
46+
include:
47+
- target: wasm32-unknown-unknown
48+
- target: wasm32-wasip2
4849
steps:
4950
- name: Checkout sources
5051
uses: actions/checkout@v3
51-
- name: Install Rust
52-
uses: actions-rs/toolchain@v1
53-
with:
54-
profile: minimal
55-
toolchain: stable
56-
components: clippy
57-
target: wasm32-unknown-unknown
52+
- name: Install Rust from rust-toolchain.toml
53+
uses: actions-rust-lang/setup-rust-toolchain@v1
5854
- name: Run cargo clippy
5955
uses: actions-rs/cargo@v1
6056
with:
6157
command: clippy
62-
args: --target wasm32-unknown-unknown -- -D warnings
58+
args: --target ${{ matrix.target }} -- -D warnings

.github/workflows/gzip.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,26 @@ jobs:
1010
test:
1111
name: Integration Tests with gzip compression
1212
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
include:
16+
- target: wasm32-unknown-unknown
17+
recipe: test-gzip-headless
18+
- target: wasm32-wasip2
19+
recipe: test-gzip-wasip2
1320
steps:
1421
- name: Checkout sources
1522
uses: actions/checkout@v3
16-
- name: Install Rust
17-
uses: actions-rs/toolchain@v1
18-
with:
19-
profile: minimal
20-
toolchain: stable
21-
target: wasm32-unknown-unknown
23+
- name: Install Rust from rust-toolchain.toml
24+
uses: actions-rust-lang/setup-rust-toolchain@v1
2225
- name: Install wasm-pack
2326
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
27+
if: ${{ matrix.target == 'wasm32-unknown-unknown' }}
28+
- name: Install wasmtime
29+
run: |
30+
curl https://wasmtime.dev/install.sh -sSf | bash
31+
echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
32+
if: ${{ matrix.target == 'wasm32-wasip2' }}
2433
- name: Install just
2534
uses: extractions/setup-just@v1
2635
- name: Install Protoc
@@ -29,5 +38,5 @@ jobs:
2938
run: just build-gzip-test-server
3039
- name: Run test `tonic-web` server
3140
run: just start-gzip-test-server &
32-
- name: Run headless browser test
33-
run: just test-gzip-headless
41+
- name: Run test ${{ matrix.recipe }}
42+
run: just ${{ matrix.recipe }}

.github/workflows/test.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,26 @@ jobs:
1010
test:
1111
name: Integration Tests
1212
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
include:
16+
- target: wasm32-unknown-unknown
17+
recipe: test-headless
18+
- target: wasm32-wasip2
19+
recipe: test-wasip2
1320
steps:
1421
- name: Checkout sources
1522
uses: actions/checkout@v3
16-
- name: Install Rust
17-
uses: actions-rs/toolchain@v1
18-
with:
19-
profile: minimal
20-
toolchain: stable
21-
target: wasm32-unknown-unknown
23+
- name: Install Rust from rust-toolchain.toml
24+
uses: actions-rust-lang/setup-rust-toolchain@v1
2225
- name: Install wasm-pack
2326
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
27+
if: ${{ matrix.target == 'wasm32-unknown-unknown' }}
28+
- name: Install wasmtime
29+
run: |
30+
curl https://wasmtime.dev/install.sh -sSf | bash
31+
echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
32+
if: ${{ matrix.target == 'wasm32-wasip2' }}
2433
- name: Install just
2534
uses: extractions/setup-just@v1
2635
- name: Install Protoc
@@ -29,5 +38,5 @@ jobs:
2938
run: just build-test-server
3039
- name: Run test `tonic-web` server
3140
run: just start-test-server &
32-
- name: Run headless browser test
33-
run: just test-headless
41+
- name: Run test ${{ matrix.recipe }}
42+
run: just ${{ matrix.recipe }}

0 commit comments

Comments
 (0)