Skip to content

Commit 8352be1

Browse files
committed
Merge branch 'main' into feat/display-dependency-impl
2 parents f5126b1 + 4e1ea31 commit 8352be1

File tree

21 files changed

+972
-518
lines changed

21 files changed

+972
-518
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,35 @@ jobs:
99
strategy:
1010
matrix:
1111
include:
12-
- os: ubuntu-latest
13-
additional_test_flags: ""
12+
- os: "ubuntu-22.04"
13+
run_lints: true
14+
test_wasm_build: true
1415
- os: windows-latest
15-
additional_test_flags: "--no-default-features"
16+
docker_tests_flags: "--no-default-features"
1617
- os: macos-latest
17-
additional_test_flags: "--no-default-features"
18+
docker_tests_flags: "--no-default-features"
1819
steps:
1920
- uses: actions/checkout@v4
2021
- uses: dtolnay/rust-toolchain@stable
2122
with:
2223
targets: "wasm32-wasip1"
23-
# We have to run these separately so we can deactivate a feature for one of the tests
24-
- name: Run client tests
25-
working-directory: ./crates/wasm-pkg-client
26-
run: cargo test ${{ matrix.additional_test_flags }}
27-
- name: Run wkg tests
28-
working-directory: ./crates/wkg
29-
run: cargo test ${{ matrix.additional_test_flags }}
30-
- name: Run other tests
24+
25+
- name: Run lints
26+
if: matrix.run_lints
27+
run: |
28+
cargo clippy --workspace --no-default-features
29+
cargo clippy --workspace --all-features
30+
31+
- name: Run tests
3132
run: cargo test --workspace --exclude wasm-pkg-client --exclude wkg
32-
- name: Run cargo clippy
33-
run: cargo clippy --all --workspace
33+
34+
# NOTE: Docker tests are only run on linux because other platforms haven't
35+
# always worked consistently.
36+
- name: Run wasm-pkg-client tests
37+
run: cargo test -p wasm-pkg-client ${{ matrix.docker_tests_flags }}
38+
- name: Run wkg tests
39+
run: cargo test -p wkg ${{ matrix.docker_tests_flags }}
40+
41+
- name: Test wasm32-wasip1 build for wasm-pkg-common
42+
if: matrix.test_wasm_build
43+
run: cargo build -p wasm-pkg-common --target wasm32-wasip1

0 commit comments

Comments
 (0)