rename wasi target

Author: anonrig

.github/workflows/ci.yml

@@ -27,17 +27,17 @@ jobs:
           - os: macos-latest
           - os: ubuntu-latest
             env:
-              CARGO_BUILD_TARGET: wasm32-wasi
+              CARGO_BUILD_TARGET: wasm32-wasip1
               CARGO_TARGET_WASM32_WASI_RUNNER: /home/runner/.wasmtime/bin/wasmtime --dir=.
     runs-on: ${{ matrix.os }}
     env: ${{ matrix.env || fromJSON('{}') }}
     steps:
       - uses: actions/checkout@v3
 
       - name: Install Wasm deps
-        if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasi'
+        if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasip1'
         run: |
-          rustup target add wasm32-wasi
+          rustup target add wasm32-wasip1
           curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk_25.0_amd64.deb
           sudo dpkg --install wasi-sdk_25.0_amd64.deb
           curl https://wasmtime.dev/install.sh -sSf | bash

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
         - os: macos-latest
         - os: ubuntu-latest
           env:
-            CARGO_BUILD_TARGET: wasm32-wasi
+            CARGO_BUILD_TARGET: wasm32-wasip1
             CARGO_TARGET_WASM32_WASI_RUNNER: /home/runner/.wasmtime/bin/wasmtime --dir=.
     runs-on: ${{ matrix.os }}
     if: github.ref == 'refs/heads/main'
@@ -37,9 +37,9 @@ jobs:
         persist-credentials: false
 
     - name: Install Wasm deps
-      if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasi'
+      if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasip1'
       run: |
-        rustup target add wasm32-wasi
+        rustup target add wasm32-wasip1
         curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk_25.0_amd64.deb
         sudo dpkg --install wasi-sdk_25.0_amd64.deb
         curl https://wasmtime.dev/install.sh -sSf | bash

build.rs

@@ -154,7 +154,7 @@ fn main() {
                     Ok(compile_target_feature) if compile_target_feature.contains("atomics") => {
                         "wasm32-wasi-threads"
                     }
-                    _ => "wasm32-wasi",
+                    _ => "wasm32-wasip1",
                 };
                 println!(
                     "cargo:rustc-link-search={wasi_sdk}/share/wasi-sysroot/lib/{wasi_sysroot_lib}"
@@ -169,7 +169,7 @@ fn main() {
                 // it's also possible to compile it to wasm32-unknown-unknown.
                 // This still requires WASI SDK for libc & libc++, but then we need a few hacks / overrides to get a pure Wasm w/o imports instead.
                 if compile_target_os == "unknown" {
-                    build.target("wasm32-wasi");
+                    build.target("wasm32-wasip1");
                     println!("cargo:rustc-link-lib=c");
                     build.file("./deps/wasi_to_unknown.cpp");
                 }