Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps) bump Wasmtime to 26.0.0 #614

Merged
merged 1 commit into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci-large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/wasm/wrt/ngx_wrt.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ typedef enum {
#include <wasmtime.h>
#include <wasi.h>

#if WASMTIME_VERSION_MAJOR != 25
#if WASMTIME_VERSION_MAJOR != 26
# error Unsupported Wasmtime version
#elif WASMTIME_VERSION_MINOR > 0
# warning Untested Wasmtime version
Expand Down
Loading