From 8d7a6f86cc0cb9261c053b75ea4a4995eb874577 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Sun, 12 Jan 2025 10:55:31 -0800
Subject: [PATCH] CI: Test wasm32-wasip2 target too.

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2859f7da3..8fd0817d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -182,6 +182,7 @@ jobs:
           - riscv64gc-unknown-linux-gnu
           - wasm32-wasi
           - wasm32-wasip1
+          - wasm32-wasip2
           - x86_64-pc-windows-gnu
           - x86_64-pc-windows-msvc
           - x86_64-apple-darwin
@@ -209,6 +210,10 @@ jobs:
           - target: wasm32-wasip1
             rust_channel: 1.63.0
 
+          # Not available.
+          - target: wasm32-wasip2
+            rust_channel: 1.63.0
+
         include:
           - target: aarch64-apple-darwin
             host_os: macos-14
@@ -320,6 +325,9 @@ jobs:
           - target: wasm32-wasip1
             host_os: ubuntu-22.04
 
+          - target: wasm32-wasip2
+            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 547a569af..d98785bc6 100755
--- a/mk/cargo.sh
+++ b/mk/cargo.sh
@@ -227,6 +227,10 @@ case $target in
     use_clang=1
     export CARGO_TARGET_WASM32_WASIP1_RUNNER=target/tools/linux-x86_64/wasmtime/wasmtime
     ;;
+  wasm32-wasip2)
+    use_clang=1
+    export CARGO_TARGET_WASM32_WASIP2_RUNNER=target/tools/linux-x86_64/wasmtime/wasmtime
+    ;;
   *)
     ;;
 esac
diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
index 07bd62ecf..3b9a5c2d8 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-wasip1)
+wasm32-wasi|wasm32-wasip1|wasm32-wasip2)
   use_clang=1
   git clone \
       --branch linux-x86_64 \