Merge with upstream up to release v1.216.0

wasmfx · Aug 23, 2024 · d4e82f5 · d4e82f5
2 parents 2cc5da3 + 28c8962
commit d4e82f5
Show file tree

Hide file tree

Showing 112 changed files with 4,156 additions and 1,022 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -85,14 +85,17 @@ jobs:
             rust: default
           - os: ubuntu-latest
             rust: msrv
+            # skip testing crates that require wasmtime since wasmtime has a
+            # more aggressive msrv than wasm-tools
+            flags: --exclude fuzz-stats --exclude wit-component --exclude wasm-mutate-stats
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
     - uses: bytecodealliance/wasmtime/.github/actions/[email protected]
       with:
         toolchain: ${{ matrix.rust }}
-    - run: cargo test --locked --all
+    - run: cargo test --locked --all ${{ matrix.flags }}
 
   test_extra_features:
     name: Test with extra Cargo features
@@ -260,10 +263,10 @@ jobs:
         submodules: true
     - uses: bytecodealliance/wasmtime/.github/actions/[email protected]
     - run: rustc ci/publish.rs
-    # Make sure the tree is publish-able as-is
-    - run: ./publish verify
     # Make sure we can bump version numbers for the next release
     - run: ./publish bump
+    # Make sure the tree is publish-able as-is
+    - run: ./publish verify
 
   # "Join node" which the merge queue waits on.
   ci-status: