diff --git a/bazel/external/wasmtime.BUILD b/bazel/external/wasmtime.BUILD index 879a84bf18466..525c9a20c0b1e 100644 --- a/bazel/external/wasmtime.BUILD +++ b/bazel/external/wasmtime.BUILD @@ -7,7 +7,7 @@ package(default_visibility = ["//visibility:public"]) cc_library( name = "helpers_lib", srcs = [ - "crates/runtime/src/helpers.c", + "crates/wasmtime/src/runtime/vm/helpers.c", ], visibility = ["//visibility:private"], ) diff --git a/bazel/proxy_wasm_cpp_host.patch b/bazel/proxy_wasm_cpp_host.patch index ce159af5ed429..0fe41ac536aae 100644 --- a/bazel/proxy_wasm_cpp_host.patch +++ b/bazel/proxy_wasm_cpp_host.patch @@ -11,3 +11,16 @@ index 69c9bda..d293092 100644 }), alwayslink = 1, ) +diff --git a/bazel/external/wasmtime.BUILD b/bazel/external/wasmtime.BUILD +index 79a331f..27da86e 100644 +--- a/bazel/external/wasmtime.BUILD ++++ b/bazel/external/wasmtime.BUILD +@@ -21,7 +21,7 @@ genrule( + "crates/c-api/include/wasm.h", + ], + outs = [ +- "include/prefixed_wasm.h", ++ "crates/c-api/include/prefixed_wasm.h", + ], + cmd = """ + sed -e 's/\\ wasm_/\\ wasmtime_wasm_/g' \ diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 39055c6e8bec9..3fb71dc670e14 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1111,11 +1111,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Webassembly Micro Runtime", project_desc = "A standalone runtime with a small footprint for WebAssembly", project_url = "https://github.com/bytecodealliance/wasm-micro-runtime", - version = "WAMR-2.0.0", - sha256 = "7663a34b61d6d0ff90778d9be37efde92e2f28ec9baad89f7b18555f0db435ab", + version = "WAMR-2.1.1", + sha256 = "04daaa934ca5bd1972432dd353b9d04a046c2d956fc923b01f74fe6af6f44f4b", strip_prefix = "wasm-micro-runtime-{version}", urls = ["https://github.com/bytecodealliance/wasm-micro-runtime/archive/{version}.tar.gz"], - release_date = "2024-04-23", + release_date = "2024-07-16", use_category = ["dataplane_ext"], extensions = ["envoy.wasm.runtime.wamr"], cpe = "N/A", @@ -1126,11 +1126,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "wasmtime", project_desc = "A standalone runtime for WebAssembly", project_url = "https://github.com/bytecodealliance/wasmtime", - version = "9.0.3", - sha256 = "917da461249b11a3176a39573723f78c627259576d0ca10b00d6e7f7fa047081", + version = "24.0.0", + sha256 = "2ccb49bb3bfa4d86907ad4c80d1147aef6156c7b6e3f7f14ed02a39de9761155", strip_prefix = "wasmtime-{version}", urls = ["https://github.com/bytecodealliance/wasmtime/archive/v{version}.tar.gz"], - release_date = "2023-05-31", + release_date = "2024-08-20", use_category = ["dataplane_ext"], extensions = ["envoy.wasm.runtime.wasmtime"], cpe = "cpe:2.3:a:bytecodealliance:wasmtime:*", @@ -1416,8 +1416,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "WebAssembly for Proxies (C++ host implementation)", project_desc = "WebAssembly for Proxies (C++ host implementation)", project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host", - version = "f199214a43337e115469d9f0dd6b77858746441b", - sha256 = "b06f193324650f80d1d5494046c45941884f4eb66025cff026edf3b506596150", + version = "3212034ee6e75d54cbf91b65cc659772166442f4", + sha256 = "2633ec772da7b0e51500328989a99a02570dbfdfe5ff74cbf83fa2d39b6e8cea", strip_prefix = "proxy-wasm-cpp-host-{version}", urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -1432,7 +1432,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.wasm.runtime.wamr", "envoy.wasm.runtime.wasmtime", ], - release_date = "2024-08-19", + release_date = "2024-09-29", cpe = "N/A", license = "Apache-2.0", license_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host/blob/{version}/LICENSE",