diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index c68eb4bf3ed2d..a6dd63843f075 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -7,6 +7,7 @@ load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonsche load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") load("@dev_pip3//:requirements.bzl", pip_dev_dependencies = "install_deps") load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") +load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains") load("@fuzzing_pip3//:requirements.bzl", pip_fuzzing_dependencies = "install_deps") load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies") load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies") @@ -61,7 +62,8 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y oss_fuzz = True, honggfuzz = False, ) - emscripten_deps(emscripten_version = "3.1.7") + emscripten_deps(emscripten_version = "3.1.67") + register_emscripten_toolchains() register_jq_toolchains(version = jq_version) register_yq_toolchains(version = yq_version) parser_deps() diff --git a/bazel/emsdk.patch b/bazel/emsdk.patch deleted file mode 100644 index 21ee8991898ea..0000000000000 --- a/bazel/emsdk.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl -index 95801ba..95fdabd 100644 ---- a/bazel/emscripten_deps.bzl -+++ b/bazel/emscripten_deps.bzl -@@ -69,31 +69,3 @@ def emscripten_deps(emscripten_version = "latest"): - build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD", - type = "zip", - ) -- -- if "emscripten_npm_linux" not in excludes: -- npm_install( -- name = "emscripten_npm_linux", -- package_json = "@emscripten_bin_linux//:emscripten/package.json", -- package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json", -- ) -- -- if "emscripten_npm_mac" not in excludes: -- npm_install( -- name = "emscripten_npm_mac", -- package_json = "@emscripten_bin_mac//:emscripten/package.json", -- package_lock_json = "@emscripten_bin_mac//:emscripten/package-lock.json", -- ) -- -- if "emscripten_npm_mac_arm64" not in excludes: -- npm_install( -- name = "emscripten_npm_mac", -- package_json = "@emscripten_bin_mac_arm64//:emscripten/package.json", -- package_lock_json = "@emscripten_bin_mac_arm64//:emscripten/package-lock.json", -- ) -- -- if "emscripten_npm_win" not in excludes: -- npm_install( -- name = "emscripten_npm_win", -- package_json = "@emscripten_bin_win//:emscripten/package.json", -- package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json", -- ) -diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel -index eb36959..12dba37 100644 ---- a/bazel/emscripten_toolchain/BUILD.bazel -+++ b/bazel/emscripten_toolchain/BUILD.bazel -@@ -13,7 +13,6 @@ filegroup( - "env.sh", - "env.bat", - "@emsdk//:binaries", -- "@emsdk//:node_modules", - "@nodejs//:node_files", - ], - ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 6379ed63d3695..67a0243303978 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -831,11 +831,7 @@ def _proxy_wasm_cpp_host(): ) def _emsdk(): - external_http_archive( - name = "emsdk", - patch_args = ["-p2"], - patches = ["@envoy//bazel:emsdk.patch"], - ) + external_http_archive("emsdk") def _com_github_google_jwt_verify(): external_http_archive("com_github_google_jwt_verify") diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 29af2efdedbcf..2c7c040f58106 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1370,12 +1370,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( release_date = "2024-07-23", use_category = ["test_only"], ), + # TEST: https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/pull/157/ proxy_wasm_cpp_sdk = dict( project_name = "WebAssembly for Proxies (C++ SDK)", project_desc = "WebAssembly for Proxies (C++ SDK)", project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-sdk", - version = "921039ae983ce053bf5cba78a85a3c08ff9791e5", - sha256 = "a11adfe4e6346d3318ff72643aa5569dc8439d7e8927ed148f93226fa255cc7a", + version = "d505642df1fc9d3c5e593c1e3b43ed1a971bdb2a", + sha256 = "b61be4e975867900df2dba5fb7607847f6e6ed0a3f0ca3b4cf50bbb46a55ab2b", strip_prefix = "proxy-wasm-cpp-sdk-{version}", urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -1390,7 +1391,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.wasm.runtime.wamr", "envoy.wasm.runtime.wasmtime", ], - release_date = "2023-05-01", + release_date = "2024-10-10", cpe = "N/A", license = "Apache-2.0", license_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/blob/{version}/LICENSE", @@ -1438,13 +1439,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Emscripten SDK", project_desc = "Emscripten SDK (use by Wasm)", project_url = "https://github.com/emscripten-core/emsdk", - # v3.1.7 with Bazel fixes - version = "0ea8f8a8707070e9a7c83fbb4a3065683bcf1799", - sha256 = "1ca0ff918d476c55707bb99bc0452be28ac5fb8f22a9260a8aae8a38d1bc0e27", + version = "3.1.67", + sha256 = "0cb0eabd6e3ceb1a970a2363e67f2b1689c2d83fbeae1e75901213c1f84de2e2", strip_prefix = "emsdk-{version}/bazel", urls = ["https://github.com/emscripten-core/emsdk/archive/{version}.tar.gz"], use_category = ["test_only"], - release_date = "2022-03-09", + release_date = "2024-09-17", license = "Emscripten SDK", license_url = "https://github.com/emscripten-core/emsdk/blob/{version}/LICENSE", ), diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 99f29f661e112..156f3a412f495 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -37,7 +37,7 @@ FETCH_GCC_TARGETS=( # but its not really possible to filter their needs so move # to a shared precache FETCH_TEST_TARGETS=( - @nodejs//... + @nodejs//:node_files //test/...) FETCH_ALL_TEST_TARGETS=( @com_github_google_quiche//:ci_tests