Merge branch 'main' into optimize-stats-computation

EmbarkStudios · Jun 28, 2024 · 751538c · 751538c
2 parents c497844 + af98035
commit 751538c
Show file tree

Hide file tree

Showing 47 changed files with 4,276 additions and 5,206 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,6 +37,8 @@ jobs:
       - run: cargo fetch
       - name: cargo clippy
         run: cargo clippy --all-targets -- -D warnings
+      - name: cargo clippy wasm32-unknown-unknown WITHOUT web feature
+        run: cargo clippy -p puffin --target wasm32-unknown-unknown --no-default-features -- -D warnings
       - name: cargo clippy wasm32
         run: cargo clippy -p puffin_viewer --target wasm32-unknown-unknown --all-features --lib
 
@@ -62,31 +64,30 @@ jobs:
       - name: cargo test build
         run: cargo build --tests --release --all-features
       - name: cargo test
-        run: cargo test -p puffin -p puffin_egui -p puffin_http -p puffin-imgui --release --all-features
+        run: cargo test -p puffin -p puffin_egui -p puffin_http --release --all-features
       - name: cargo test --doc
         run: cargo test --workspace --doc
       - name: cargo doc
-        run: cargo doc -p puffin -p puffin_egui -p puffin_http -p puffin-imgui -p --lib --no-deps --all-features
+        run: cargo doc -p puffin -p puffin_egui -p puffin_http -p --lib --no-deps --all-features
 
   cargo-vet:
     name: Vet Dependencies
     runs-on: ubuntu-20.04-16core
     env:
-      # there is no published release for v0.7 yet, build from git revision
-      CARGO_VET_REVISION: 088586c
+      CARGO_VET_VERSION: 0.9.1
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - uses: actions/cache@v3
         with:
           path: ${{ runner.tool_cache }}/cargo-vet
-          key: cargo-vet-bin-${{ env.CARGO_VET_REVISION }}
+          key: cargo-vet-bin-${{ env.CARGO_VET_VERSION }}
       - name: Add the tool cache directory to the search path
         run: echo "${{ runner.tool_cache }}/cargo-vet/bin" >> $GITHUB_PATH
       - name: Ensure that the tool cache is populated with the cargo-vet binary
         # build from source, as are not published binaries yet :(
         # tracked in https://github.com/mozilla/cargo-vet/issues/484
-        run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --git https://github.com/mozilla/cargo-vet.git --rev ${{ env.CARGO_VET_REVISION }} cargo-vet
+        run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --version ${{ env.CARGO_VET_VERSION }} cargo-vet
       - name: Invoke cargo-vet
         run: |
           cargo vet --locked