From b0daa33147bc38dfd3edef5ae9a939510960ebbc Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Fri, 10 Jan 2025 10:45:41 -0800
Subject: [PATCH] CI: Fix build by dealing with wasm32-wasi -> wasip1
 transition.

---
 .github/workflows/ci.yml  | 13 +++++++++++++
 mk/cargo.sh               |  2 +-
 mk/install-build-tools.sh |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7628c4625f..2859f7da3b 100644
--- 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
index f344e91fba..bcb7b787e6 100755
--- a/mk/cargo.sh
+++ b/mk/cargo.sh
@@ -219,7 +219,7 @@ case $target in
     export CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner
     export WASM_BINDGEN_TEST_TIMEOUT=60
     ;;
-  wasm32-wasi)
+  wasm32-wasi|wasm32-wasip1)
     # 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
diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
index e8cd96a1c4..07bd62ecfa 100755
--- 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 \