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

Jump to bottom

[TESTING/WIP] Check CI for emsdk update in proxy-wasm-cpp-sdk PR#173 #36526

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+12 −62
Draft

[TESTING/WIP] Check CI for emsdk update in proxy-wasm-cpp-sdk PR#173 #36526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84ad6e5
[TESTING/WIP] ci/coverage: Test proxy-wasm-cpp-sdk PR#157
martijneken Oct 2, 2024
af1e374
Update to match CppSdk PR#172 (remove emsdk patch)
martijneken Oct 9, 2024
02820a1
Fix cpp-sdk release_date
martijneken Oct 10, 2024
c235c1b
Repoint at PR proxy-wasm#173 to test Abseil/RE2 change
martijneken Oct 10, 2024
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
4 changes: 3 additions & 1 deletion bazel/dependency_imports.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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()
Expand Down
48 changes: 0 additions & 48 deletions bazel/emsdk.patch
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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",
Expand Down Expand Up @@ -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",
),
Expand Down
2 changes: 1 addition & 1 deletion ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down