From 5b1dc4d3d7f526945971e9cf043372898df41aa3 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Wed, 1 Nov 2023 08:52:14 -0700 Subject: [PATCH 1/2] chore(deps) bump Wasmtime to 14.0.3 --- .github/workflows/ci-large.yml | 12 ++++++------ .github/workflows/ci.yml | 14 +++++++------- Makefile | 2 +- valgrind.suppress | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml index 70ae0cf56..0e7801f27 100644 --- a/.github/workflows/ci-large.yml +++ b/.github/workflows/ci-large.yml @@ -25,7 +25,7 @@ jobs: cc: [gcc-12] ngx: [1.25.3] runtime: [wasmtime, wasmer, v8] - wasmtime: [12.0.2] + wasmtime: [14.0.3] wasmer: [3.1.1] v8: [11.4.183.23] debug: [debug, no_debug] @@ -38,7 +38,7 @@ jobs: cc: gcc-12 openresty: 1.21.4.2 runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 debug: debug hup: no_hup ssl: ssl @@ -68,7 +68,7 @@ jobs: cc: [gcc-12] ngx: [1.25.3] runtime: [wasmer, wasmtime, v8] - wasmtime: [12.0.2] + wasmtime: [14.0.3] wasmer: [3.1.1] v8: [11.4.183.23] hup: [hup, no_hup] @@ -106,7 +106,7 @@ jobs: cc: [clang-15] openresty: [1.21.4.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [12.0.2] + wasmtime: [14.0.3] wasmer: [3.1.1] v8: [11.4.183.23] ssl: [no_ssl, ssl] @@ -134,7 +134,7 @@ jobs: cc: [clang-13, clang-14, gcc-10, gcc-11] ngx: [1.25.3] runtime: [wasmtime, wasmer, v8] - wasmtime: [12.0.2] + wasmtime: [14.0.3] wasmer: [3.1.1] v8: [11.4.183.23] include: @@ -143,7 +143,7 @@ jobs: cc: clang-15 ngx: 1.21.6 runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 uses: ./.github/workflows/job-build-tests.yml with: os: ${{ matrix.os }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff03e61a6..5ea8a44ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: include: # Wasmtime - runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 os: ubuntu-latest cc: gcc-12 ngx: 1.25.3 @@ -76,7 +76,7 @@ jobs: cc: gcc-12 ngx: 1.25.3 runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 ssl: ssl debug: debug hup: hup @@ -96,7 +96,7 @@ jobs: cc: gcc-12 openresty: 1.21.4.2 runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 ssl: ssl debug: debug hup: no_hup @@ -106,7 +106,7 @@ jobs: cc: gcc-12 openresty: 1.21.4.2 runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 ssl: ssl debug: debug hup: no_hup @@ -161,7 +161,7 @@ jobs: include: # Wasmtime - runtime: wasmtime - wasmtime: 12.0.2 + wasmtime: 14.0.3 os: ubuntu-22.04 cc: gcc-12 ngx: 1.25.3 @@ -245,7 +245,7 @@ jobs: cc: [clang-15] openresty: [1.21.4.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [12.0.2] + wasmtime: [14.0.3] wasmer: [3.1.1] v8: [11.4.183.23] ssl: [ssl] @@ -281,7 +281,7 @@ jobs: cc: [clang-15, gcc-12] ngx: [1.25.3] runtime: [wasmtime, wasmer, v8] - wasmtime: [12.0.2] + wasmtime: [14.0.3] wasmer: [3.1.1] v8: [11.4.183.23] uses: ./.github/workflows/job-build-tests.yml diff --git a/Makefile b/Makefile index b577a7bba..c13eb2e6f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NGX ?= 1.25.3 OPENSSL ?= 3.1.4 -WASMTIME ?= 12.0.2 +WASMTIME ?= 14.0.3 WASMER ?= 3.1.1 V8 ?= 11.4.183.23 PCRE ?= 8.45 diff --git a/valgrind.suppress b/valgrind.suppress index 74efefa28..c3b011f51 100644 --- a/valgrind.suppress +++ b/valgrind.suppress @@ -56,9 +56,9 @@ fun:wasm_module_new } { - + Memcheck:Cond - fun:_ZN10wasmparser6parser6Parser5parse17h6d71d9974412b3d6E + fun:_ZN10wasmparser6parser6Parser5parse17h* } { From 0a6714fbb2069a7cc64b54443cede12b444f047a Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Wed, 1 Nov 2023 09:49:47 -0700 Subject: [PATCH 2/2] misc(wrt) add Wasmtime version checks --- src/wasm/wrt/ngx_wrt.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/wasm/wrt/ngx_wrt.h b/src/wasm/wrt/ngx_wrt.h index 6869df54d..031fe22ab 100644 --- a/src/wasm/wrt/ngx_wrt.h +++ b/src/wasm/wrt/ngx_wrt.h @@ -61,6 +61,11 @@ typedef enum { #include #include +#if WASMTIME_VERSION_MAJOR != 14 +# error Unsupported Wasmtime version +#elif WASMTIME_VERSION_MINOR > 0 +# warning Untested Wasmtime version +#endif typedef wasmtime_error_t ngx_wrt_res_t;