Some more minor differences with main

Author: alexcrichton

ci/build-test-matrix.js

@@ -13,7 +13,7 @@ const GENERIC_BUCKETS = 3;
 
 // Crates which are their own buckets. These are the very slowest to
 // compile-and-test crates.
-const SINGLE_CRATE_BUCKETS = ["wasmtime", "wasmtime-cli", "wasmtime-wasi", 'component-async-tests'];
+const SINGLE_CRATE_BUCKETS = ["wasmtime", "wasmtime-cli", "wasmtime-wasi"];
 
 const ubuntu = 'ubuntu-24.04';
 const windows = 'windows-2025';

crates/wasi/src/p3/wit/package.wit

@@ -1 +1,2 @@
+// We actually don't use this; it's just to let bindgen! find the corresponding world in wit/deps.
 package wasmtime:wasi;

crates/wasi/tests/all/p3/mod.rs

@@ -14,6 +14,7 @@ async fn run(path: &str) -> Result<()> {
         config.wasm_component_model_async(true);
     });
     let mut linker = Linker::new(&engine);
+    // TODO: Remove once test components are not built for `wasm32-wasip1`
     wasmtime_wasi::p2::add_to_linker_async(&mut linker)
         .context("failed to link `wasi:cli@0.2.x`")?;
     wasmtime_wasi::p3::add_to_linker(&mut linker).context("failed to link `wasi:cli@0.3.x`")?;