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.

Sign up for GitHub

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 14.0.3 #438

Merged
merged 2 commits into from
Nov 3, 2023
Merged

chore(deps) bump Wasmtime to 14.0.3 #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b1dc4d
chore(deps) bump Wasmtime to 14.0.3
thibaultcha Nov 1, 2023
0a6714f
misc(wrt) add Wasmtime version checks
thibaultcha Nov 1, 2023
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
12 changes: 6 additions & 6 deletions .github/workflows/ci-large.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/wasm/wrt/ngx_wrt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ typedef enum {
#include <wasmtime.h>
#include <wasi.h>

#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;

Expand Down
4 changes: 2 additions & 2 deletions valgrind.suppress
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
fun:wasm_module_new
}
{
<wasmtime 12.0.2: parse>
<wasmtime 14.0.3: parse>
Memcheck:Cond
fun:_ZN10wasmparser6parser6Parser5parse17h6d71d9974412b3d6E
fun:_ZN10wasmparser6parser6Parser5parse17h*
}
{
<v8 11.4.183.23: wasm_engine_new>
Expand Down
Loading