chore(*) cargo update and switch to 'wasm32-wasip1' target

Kong · Sep 24, 2024 · f8d79ee · f8d79ee
1 parent 39dd7ec
commit f8d79ee
Show file tree

Hide file tree

Showing 10 changed files with 133 additions and 107 deletions.
diff --git a/.github/workflows/job-unit-tests.yml b/.github/workflows/job-unit-tests.yml
@@ -102,7 +102,7 @@ jobs:
         if: ${{ !env.ACT }}
         uses: dtolnay/rust-toolchain@stable
         with:
-          target: wasm32-wasi
+          target: wasm32-wasip1
       - name: Setup Go
         if: ${{ !env.ACT }}
         uses: actions/setup-go@v5

diff --git a/.github/workflows/job-valgrind-tests.yml b/.github/workflows/job-valgrind-tests.yml
@@ -95,7 +95,7 @@ jobs:
         if: ${{ !env.ACT }}
         uses: dtolnay/rust-toolchain@stable
         with:
-          target: wasm32-wasi
+          target: wasm32-wasip1
       - name: Setup Go
         if: ${{ !env.ACT }}
         uses: actions/setup-go@v5

diff --git a/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 b/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04
@@ -54,7 +54,7 @@ RUN apt-get install -y \
         unzip \
         sudo && \
     update-alternatives --install /usr/bin/scan-build scan-build /usr/bin/scan-build-${CLANG_VERSION} 100 && \
-    rustup target add wasm32-wasi && \
+    rustup target add wasm32-wasip1 && \
     rustup target add wasm32-unknown-unknown && \
     curl -sLO https://golang.google.cn/dl/go${GOLANG_VERSION}.linux-$(cat /TG_ARCH).tar.gz && \
     sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-$(cat /TG_ARCH).tar.gz && \

diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
@@ -44,7 +44,7 @@ the system will quickly become necessary for development:
     - Then add the Wasm target to your toolchain: `rustup target add
       wasm32-unknown-unknown`.
     - As well as the [WASI](https://wasi.dev/) target: `rustup target add
-      wasm32-wasi`.
+      wasm32-wasip1`.
 
 [Back to TOC](#table-of-contents)
 

diff --git a/lib/Cargo.lock b/lib/Cargo.lock
diff --git a/t/03-proxy_wasm/hfuncs/119-proxy_properties_get_ngx.t b/t/03-proxy_wasm/hfuncs/119-proxy_properties_get_ngx.t
@@ -149,5 +149,5 @@ ngx_http_* calls.
     qr/\[info\] .*? \[hostcalls\] on_tick/,
     qr/\[error\] .*? cannot get ngx properties outside of a request/,
     qr/\[crit\] .*? panicked at/,
-    qr/unexpected status: 10/,
+    qr/value: InternalFailure/,
 ]
diff --git a/t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t b/t/03-proxy_wasm/hfuncs/120-proxy_properties_get_host.t
@@ -144,7 +144,7 @@ qr/\[info\] .*? property not found: was,/
     qr/\[info\] .*? \[hostcalls\] on_tick/,
     qr/\[error\] .*? cannot get host properties outside of a request/,
     qr/\[crit\] .*? panicked at/,
-    qr/unexpected status: 10/,
+    qr/value: InternalFailure/,
 ]
 
 
@@ -168,5 +168,5 @@ qr/\[info\] .*? property not found: was,/
     qr/\[info\] .*? \[hostcalls\] on_tick/,
     qr/\[error\] .*? cannot get host properties outside of a request/,
     qr/\[crit\] .*? panicked at/,
-    qr/unexpected status: 10/,
+    qr/value: InternalFailure/,
 ]