From 624307a1265193da3519b1e89ceca0be615886d9 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Tue, 30 Jul 2024 08:41:14 -0700 Subject: [PATCH] chore(deps) bump Wasmtime to 23.0.1 --- .github/workflows/ci-large.yml | 16 ++++++++-------- .github/workflows/ci.yml | 16 ++++++++-------- Makefile | 2 +- src/wasm/wrt/ngx_wrt.h | 2 +- valgrind.suppress | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml index 9f9ad1c43..f71c3a19a 100644 --- a/.github/workflows/ci-large.yml +++ b/.github/workflows/ci-large.yml @@ -25,7 +25,7 @@ jobs: cc: [gcc-12] ngx: [1.27.0] runtime: [wasmtime, wasmer, v8] - wasmtime: [22.0.0] + wasmtime: [23.0.1] wasmer: [3.1.1] v8: [12.0.267.17] ipc: [no_ipc] @@ -40,7 +40,7 @@ jobs: cc: gcc-12 openresty: 1.25.3.2 runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 ipc: no_ipc ssl: ssl debug: debug @@ -59,7 +59,7 @@ jobs: # macOS - Wasmtime - label: macos_wasmtime runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 os: macos-13 cc: clang ngx: 1.27.0 @@ -103,7 +103,7 @@ jobs: cc: [gcc-12] ngx: [1.27.0] runtime: [wasmer, wasmtime, v8] - wasmtime: [22.0.0] + wasmtime: [23.0.1] wasmer: [3.1.1] v8: [12.0.267.17] hup: [hup, no_hup] @@ -142,7 +142,7 @@ jobs: cc: [clang-15] openresty: [1.25.3.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [22.0.0] + wasmtime: [23.0.1] wasmer: [3.1.1] v8: [12.0.267.17] ssl: [no_ssl, ssl] @@ -171,7 +171,7 @@ jobs: cc: [clang-13, clang-14, gcc-10, gcc-11] ngx: [1.27.0] runtime: [wasmtime, wasmer, v8] - wasmtime: [22.0.0] + wasmtime: [23.0.1] wasmer: [3.1.1] v8: [12.0.267.17] include: @@ -180,13 +180,13 @@ jobs: cc: clang-15 ngx: 1.21.6 runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 - label: old_openresty os: ubuntu-latest cc: clang-15 openresty: 1.21.4.2 runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 uses: ./.github/workflows/job-build-tests.yml with: os: ${{ matrix.os }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0577e6035..0fe58b092 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: include: # Wasmtime - runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 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: 22.0.0 + wasmtime: 23.0.1 ipc: no_ipc ssl: ssl debug: debug @@ -104,7 +104,7 @@ jobs: cc: gcc-12 openresty: 1.25.3.2 runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 ipc: no_ipc ssl: ssl debug: debug @@ -115,7 +115,7 @@ jobs: cc: gcc-12 openresty: 1.25.3.2 runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 ipc: no_ipc ssl: ssl debug: debug @@ -127,7 +127,7 @@ jobs: cc: gcc-12 ngx: 1.27.0 runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 ipc: ipc ssl: no_ssl debug: debug @@ -185,7 +185,7 @@ jobs: include: # Wasmtime - runtime: wasmtime - wasmtime: 22.0.0 + wasmtime: 23.0.1 os: ubuntu-22.04 cc: gcc-12 ngx: 1.27.0 @@ -276,7 +276,7 @@ jobs: cc: [clang-15] openresty: [1.25.3.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [22.0.0] + wasmtime: [23.0.1] wasmer: [3.1.1] v8: [12.0.267.17] ssl: [ssl] @@ -313,7 +313,7 @@ jobs: cc: [clang-15, gcc-12] ngx: [1.27.0] runtime: [wasmtime, wasmer, v8] - wasmtime: [22.0.0] + wasmtime: [23.0.1] wasmer: [3.1.1] v8: [12.0.267.17] uses: ./.github/workflows/job-build-tests.yml diff --git a/Makefile b/Makefile index 5e451082b..c023c3e81 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NGX ?= 1.27.0 OPENSSL ?= 3.3.1 -WASMTIME ?= 22.0.0 +WASMTIME ?= 23.0.1 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 index 32a4e6edc..e2655e342 100644 --- a/src/wasm/wrt/ngx_wrt.h +++ b/src/wasm/wrt/ngx_wrt.h @@ -62,7 +62,7 @@ typedef enum { #include #include -#if WASMTIME_VERSION_MAJOR != 22 +#if WASMTIME_VERSION_MAJOR != 23 # error Unsupported Wasmtime version #elif WASMTIME_VERSION_MINOR > 0 # warning Untested Wasmtime version diff --git a/valgrind.suppress b/valgrind.suppress index 1e1c5842b..abdf6873f 100644 --- a/valgrind.suppress +++ b/valgrind.suppress @@ -30,7 +30,7 @@ fun:ngx_http_headers_more_filter } { - + Memcheck:Cond fun:_ZN10wasmparser6parser6Parser12parse_reader17h* }