From 11f87c1d83ed29e381da5a56df7a94e896fc0d9f Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Tue, 22 Oct 2024 13:29:20 -0700 Subject: [PATCH] chore(deps) bump Wasmtime to 26.0.0 --- .github/workflows/ci-large.yml | 16 ++++++++-------- .github/workflows/ci.yml | 18 +++++++++--------- Makefile | 2 +- src/wasm/wrt/ngx_wrt.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml index 7357c3784..deb793867 100644 --- a/.github/workflows/ci-large.yml +++ b/.github/workflows/ci-large.yml @@ -25,7 +25,7 @@ jobs: cc: [gcc-12] ngx: [1.27.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [25.0.1] + wasmtime: [26.0.0] 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: 25.0.1 + wasmtime: 26.0.0 ipc: no_ipc ssl: ssl debug: debug @@ -59,7 +59,7 @@ jobs: # macOS - Wasmtime - label: macos_wasmtime runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 os: macos-13 cc: clang ngx: 1.27.2 @@ -103,7 +103,7 @@ jobs: cc: [gcc-12] ngx: [1.27.2] runtime: [wasmer, wasmtime, v8] - wasmtime: [25.0.1] + wasmtime: [26.0.0] 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: [25.0.1] + wasmtime: [26.0.0] 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.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [25.0.1] + wasmtime: [26.0.0] 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: 25.0.1 + wasmtime: 26.0.0 - label: old_openresty os: ubuntu-latest cc: clang-15 openresty: 1.21.4.2 runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.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 index ca3dda0bb..50f0de18b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: include: # Wasmtime - runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 os: ubuntu-latest cc: gcc-12 ngx: 1.27.2 @@ -67,7 +67,7 @@ jobs: hup: no_hup # wasm32-unknown-unknown - runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 os: ubuntu-latest cc: gcc-12 ngx: 1.27.2 @@ -93,7 +93,7 @@ jobs: cc: gcc-12 ngx: 1.27.2 runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 ipc: no_ipc ssl: ssl debug: debug @@ -115,7 +115,7 @@ jobs: cc: gcc-12 openresty: 1.25.3.2 runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 ipc: no_ipc ssl: ssl debug: debug @@ -126,7 +126,7 @@ jobs: cc: gcc-12 openresty: 1.25.3.2 runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 ipc: no_ipc ssl: ssl debug: debug @@ -138,7 +138,7 @@ jobs: cc: gcc-12 ngx: 1.27.2 runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 ipc: ipc ssl: no_ssl debug: debug @@ -197,7 +197,7 @@ jobs: include: # Wasmtime - runtime: wasmtime - wasmtime: 25.0.1 + wasmtime: 26.0.0 os: ubuntu-22.04 cc: gcc-12 ngx: 1.27.2 @@ -288,7 +288,7 @@ jobs: cc: [clang-15] openresty: [1.25.3.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [25.0.1] + wasmtime: [26.0.0] wasmer: [3.1.1] v8: [12.0.267.17] ssl: [ssl] @@ -325,7 +325,7 @@ jobs: cc: [clang-15, gcc-12] ngx: [1.27.2] runtime: [wasmtime, wasmer, v8] - wasmtime: [25.0.1] + wasmtime: [26.0.0] wasmer: [3.1.1] v8: [12.0.267.17] uses: ./.github/workflows/job-build-tests.yml diff --git a/Makefile b/Makefile index d9ee2cf33..c5f0f82d4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NGX ?= 1.27.2 OPENSSL ?= 3.4.0 -WASMTIME ?= 25.0.1 +WASMTIME ?= 26.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 index 10df897fb..617174b34 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 != 25 +#if WASMTIME_VERSION_MAJOR != 26 # error Unsupported Wasmtime version #elif WASMTIME_VERSION_MINOR > 0 # warning Untested Wasmtime version