chore(deps) bump Wasmtime to 22.0.0

Kong · Jun 26, 2024 · b28ddaa · b28ddaa
1 parent 2315eef
commit b28ddaa
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml
@@ -26,7 +26,7 @@ jobs:
         cc: [gcc-12]
         ngx: [1.27.0]
         runtime: [wasmtime, wasmer, v8]
-        wasmtime: [19.0.0]
+        wasmtime: [22.0.0]
         wasmer: [3.1.1]
         v8: [12.0.267.17]
         ipc: [no_ipc]
@@ -41,7 +41,7 @@ jobs:
             cc: gcc-12
             openresty: 1.25.3.1
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             ipc: no_ipc
             ssl: ssl
             debug: debug
@@ -74,7 +74,7 @@ jobs:
         cc: [gcc-12]
         ngx: [1.27.0]
         runtime: [wasmer, wasmtime, v8]
-        wasmtime: [19.0.0]
+        wasmtime: [22.0.0]
         wasmer: [3.1.1]
         v8: [12.0.267.17]
         hup: [hup, no_hup]
@@ -113,7 +113,7 @@ jobs:
         cc: [clang-15]
         openresty: [1.25.3.1]
         runtime: [wasmtime, wasmer, v8]
-        wasmtime: [19.0.0]
+        wasmtime: [22.0.0]
         wasmer: [3.1.1]
         v8: [12.0.267.17]
         ssl: [no_ssl, ssl]
@@ -142,7 +142,7 @@ jobs:
         cc: [clang-13, clang-14, gcc-10, gcc-11]
         ngx: [1.27.0]
         runtime: [wasmtime, wasmer, v8]
-        wasmtime: [19.0.0]
+        wasmtime: [22.0.0]
         wasmer: [3.1.1]
         v8: [12.0.267.17]
         include:
@@ -151,13 +151,13 @@ jobs:
             cc: clang-15
             ngx: 1.21.6
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
           - label: old_openresty
             os: ubuntu-latest
             cc: clang-15
             openresty: 1.21.4.2
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
     uses: ./.github/workflows/job-build-tests.yml
     with:
       os: ${{ matrix.os }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
         include:
           # Wasmtime
           - runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             os: ubuntu-latest
             cc: gcc-12
             ngx: 1.27.0
@@ -82,7 +82,7 @@ jobs:
             cc: gcc-12
             ngx: 1.27.0
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             ipc: no_ipc
             ssl: ssl
             debug: debug
@@ -104,7 +104,7 @@ jobs:
             cc: gcc-12
             openresty: 1.25.3.1
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             ipc: no_ipc
             ssl: ssl
             debug: debug
@@ -115,7 +115,7 @@ jobs:
             cc: gcc-12
             openresty: 1.25.3.1
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             ipc: no_ipc
             ssl: ssl
             debug: debug
@@ -127,7 +127,7 @@ jobs:
             cc: gcc-12
             ngx: 1.27.0
             runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             ipc: ipc
             ssl: no_ssl
             debug: debug
@@ -186,7 +186,7 @@ jobs:
         include:
           # Wasmtime
           - runtime: wasmtime
-            wasmtime: 19.0.0
+            wasmtime: 22.0.0
             os: ubuntu-22.04
             cc: gcc-12
             ngx: 1.27.0
@@ -277,7 +277,7 @@ jobs:
         cc: [clang-15]
         openresty: [1.25.3.1]
         runtime: [wasmtime, wasmer, v8]
-        wasmtime: [19.0.0]
+        wasmtime: [22.0.0]
         wasmer: [3.1.1]
         v8: [12.0.267.17]
         ssl: [ssl]
@@ -314,7 +314,7 @@ jobs:
         cc: [clang-15, gcc-12]
         ngx: [1.27.0]
         runtime: [wasmtime, wasmer, v8]
-        wasmtime: [19.0.0]
+        wasmtime: [22.0.0]
         wasmer: [3.1.1]
         v8: [12.0.267.17]
     uses: ./.github/workflows/job-build-tests.yml

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 NGX ?= 1.27.0
 OPENSSL ?= 3.3.1
-WASMTIME ?= 19.0.0
+WASMTIME ?= 22.0.0
 WASMER ?= 3.1.1
 V8 ?= 12.0.267.17
 PCRE ?= 8.45

diff --git a/src/wasm/wrt/ngx_wrt.h b/src/wasm/wrt/ngx_wrt.h
@@ -62,7 +62,7 @@ typedef enum {
 #include <wasmtime.h>
 #include <wasi.h>
 
-#if WASMTIME_VERSION_MAJOR != 19
+#if WASMTIME_VERSION_MAJOR != 22
 #   error Unsupported Wasmtime version
 #elif WASMTIME_VERSION_MINOR > 0
 #   warning Untested Wasmtime version

diff --git a/valgrind.suppress b/valgrind.suppress
@@ -30,7 +30,12 @@
    fun:ngx_http_headers_more_filter
 }
 {
-   <wasmparser::parse>
+   <wasmtime 22.0.0: wasmparser::parse>
+   Memcheck:Cond
+   fun:_ZN10wasmparser6parser6Parser12parse_reader17h*
+}
+{
+   <wasmer 3.1.1: wasmparser::parse>
    Memcheck:Cond
    fun:_ZN10wasmparser6parser6Parser5parse17h*
 }