CI: Fix build by dealing with wasm32-wasi -> wasip1 transition.

briansmith · Jan 12, 2025 · 691e0ba · 691e0ba
1 parent d2e401f
commit 691e0ba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -181,6 +181,7 @@ jobs:
           - i686-unknown-linux-musl
           - riscv64gc-unknown-linux-gnu
           - wasm32-wasi
+          - wasm32-wasip1
           - x86_64-pc-windows-gnu
           - x86_64-pc-windows-msvc
           - x86_64-apple-darwin
@@ -199,6 +200,15 @@ jobs:
           # - nightly
           # - beta
 
+        exclude:
+          # Not available anymore.
+          - target: wasm32-wasi
+            rust_channel: stable
+
+          # Not available.
+          - target: wasm32-wasip1
+            rust_channel: 1.63.0
+
         include:
           - target: aarch64-apple-darwin
             host_os: macos-14
@@ -307,6 +317,9 @@ jobs:
           - target: wasm32-wasi
             host_os: ubuntu-22.04
 
+          - target: wasm32-wasip1
+            host_os: ubuntu-22.04
+
           - target: x86_64-pc-windows-gnu
             host_os: windows-latest
 

diff --git a/mk/cargo.sh b/mk/cargo.sh
@@ -220,10 +220,13 @@ case $target in
     export WASM_BINDGEN_TEST_TIMEOUT=60
     ;;
   wasm32-wasi)
-    # The first two are only needed for when the "wasm_c" feature is enabled.
     use_clang=1
     export CARGO_TARGET_WASM32_WASI_RUNNER=target/tools/linux-x86_64/wasmtime/wasmtime
     ;;
+  wasm32-wasip1)
+    use_clang=1
+    export CARGO_TARGET_WASM32_WASIP1_RUNNER=target/tools/linux-x86_64/wasmtime/wasmtime
+    ;;
   *)
     ;;
 esac

diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
@@ -193,7 +193,7 @@ wasm32-unknown-unknown)
   cargo install wasm-bindgen-cli --bin wasm-bindgen-test-runner
   use_clang=1
   ;;
-wasm32-wasi)
+wasm32-wasi|wasm32-wasip1)
   use_clang=1
   git clone \
       --branch linux-x86_64 \