diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index b743a1936d0d8..98b6ad31a0788 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -12,6 +12,7 @@ load("@base_pip3//:requirements.bzl", pip_dependencies = "install_deps") load("@dev_pip3//:requirements.bzl", pip_dev_dependencies = "install_deps") load("@fuzzing_pip3//:requirements.bzl", pip_fuzzing_dependencies = "install_deps") load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") +load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains") load("@com_github_aignas_rules_shellcheck//:deps.bzl", "shellcheck_dependencies") load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "register_yq_toolchains") load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") @@ -57,7 +58,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.44") + 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 index 21ee8991898ea..032ca53d05a13 100644 --- a/bazel/emsdk.patch +++ b/bazel/emsdk.patch @@ -1,9 +1,9 @@ diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl -index 95801ba..95fdabd 100644 +index 219cd93..c127d49 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", +@@ -167,38 +167,3 @@ def emscripten_deps(emscripten_version = "latest"): + build_file_content = BUILD_FILE_CONTENT_TEMPLATE.format(bin_extension = ".exe"), type = "zip", ) - @@ -14,6 +14,13 @@ index 95801ba..95fdabd 100644 - package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json", - ) - +- if "emscripten_npm_linux_arm64" not in excludes: +- npm_install( +- name = "emscripten_npm_linux_arm64", +- package_json = "@emscripten_bin_linux_arm64//:emscripten/package.json", +- package_lock_json = "@emscripten_bin_linux_arm64//:emscripten/package-lock.json", +- ) +- - if "emscripten_npm_mac" not in excludes: - npm_install( - name = "emscripten_npm_mac", @@ -34,15 +41,3 @@ index 95801ba..95fdabd 100644 - 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/repository_locations.bzl b/bazel/repository_locations.bzl index be555de6a0840..2970ba8687974 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1300,12 +1300,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( license = "Apache-2.0", license_url = "https://github.com/dpkp/kafka-python/blob/{version}/LICENSE", ), + # 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 = "e30535b7c0cd3126e6401bc3769063a74bbb37be", - sha256 = "94e474ebea782225821224734ed5992fa749301e12e06b6520b8b4d4e1c05ffc", + version = "2679d4bddaede88ca48e4cf9f1bdf884adb18bcd", + sha256 = "04ae5e2bad2c4b281f9874515ddf9d060529f0be3a30911b4c7c7bd73d65ce68", 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"], @@ -1321,7 +1322,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.wasm.runtime.wavm", "envoy.wasm.runtime.wasmtime", ], - release_date = "2022-03-15", + release_date = "2023-08-29", cpe = "N/A", license = "Apache-2.0", license_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/blob/{version}/LICENSE", @@ -1366,17 +1367,18 @@ REPOSITORY_LOCATIONS_SPEC = dict( license = "Apache-2.0", license_url = "https://github.com/proxy-wasm/proxy-wasm-rust-sdk/blob/v{version}/LICENSE", ), + # TEST: https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/pull/157/ emsdk = 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", + # v3.1.44 with Bazel platforms fixes + version = "9b0db91883452051aca8deddc932363aab29060b", + sha256 = "05bad056df1286f920c675504787510434ae8b1b2d83746e0a9b0589429dbe55", 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 = "2022-08-29", license = "Emscripten SDK", license_url = "https://github.com/emscripten-core/emsdk/blob/{version}/LICENSE", ),