Skip to content

Commit 568f798

Browse files
authored
wasm/deps: provide dependencies in bzlmod (#934)
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent b9220f9 commit 568f798

File tree

7 files changed

+3674
-6
lines changed

7 files changed

+3674
-6
lines changed

.bcr/wasm-cc/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ tasks:
1313
platform: ${{ unix_platform }}
1414
bazel: ${{ bazel }}
1515
build_targets:
16-
- "@envoy_examples_wasmcc//..."
16+
- "@envoy_example_wasm_cc//..."

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ distribution/custom
6060
examples/websocket/certs
6161
/contrib/golang/**/test_data/go.sum
6262
/contrib/golang/**/test_data/*/go.sum
63+
/wasm-cc/bazel-*
6364

6465
examples/single-page-app/xds/lds.yml
6566
!examples/single-page-app/ui/.env

MODULE.bazel

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
module(
22
name = "envoy_examples",
3-
version = "0.1.4-dev",
3+
version = "0.1.6-dev",
4+
)
5+
6+
bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
7+
bazel_dep(name = "rules_pkg", version = "1.1.0")
8+
bazel_dep(name = "rules_python", version = "1.7.0")
9+
bazel_dep(name = "rules_shell", version = "0.6.1")
10+
bazel_dep(name = "envoy_example_wasm_cc", version = "0.1.6-dev")
11+
local_path_override(
12+
module_name = "envoy_example_wasm_cc",
13+
path = "wasm-cc",
414
)

MODULE.bazel.lock

Lines changed: 495 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wasm-cc/.bazelversion

Lines changed: 0 additions & 1 deletion
This file was deleted.

wasm-cc/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.bazelversion

wasm-cc/MODULE.bazel

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,61 @@
11
module(
2-
name = "envoy_example_wasmcc",
3-
version = "0.1.4-dev",
4-
repo_name = "envoy-example-wasmcc"
2+
name = "envoy_example_wasm_cc",
3+
version = "0.1.6-dev",
4+
repo_name = "envoy-example-wasmcc",
55
)
6+
7+
bazel_dep(name = "emsdk", version = "4.0.13")
8+
bazel_dep(name = "envoy", version = "1.36.4-dev")
9+
bazel_dep(name = "envoy_api", version = "1.36.4-dev")
10+
bazel_dep(name = "envoy_build_config", version = "1.36.4-dev")
11+
bazel_dep(name = "envoy_mobile", version = "1.36.4-dev")
12+
bazel_dep(name = "envoy_toolshed", version = "0.3.25")
13+
bazel_dep(name = "grpc", version = "1.72.0", repo_name = "com_github_grpc_grpc")
14+
bazel_dep(name = "rules_cc", version = "0.1.1")
15+
bazel_dep(name = "rules_fuzzing", version = "0.6.0")
16+
bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
17+
bazel_dep(name = "rules_perl", version = "0.4.1")
18+
bazel_dep(name = "rules_proto_grpc", version = "5.0.0")
19+
bazel_dep(name = "rules_pkg", version = "1.1.0")
20+
bazel_dep(name = "rules_python", version = "1.7.0")
21+
bazel_dep(name = "rules_rust", version = "0.68.1")
22+
23+
bazel_dep(name = "toolchains_llvm", version = "1.4.0", dev_dependency = True)
24+
25+
# Git overrides for bzlmod migration
26+
git_override(
27+
module_name = "envoy",
28+
commit = "f75d37791e180ac9f5a09a9535ef912f0fb0bcc9",
29+
remote = "https://github.com/mmorel-35/envoy",
30+
)
31+
32+
git_override(
33+
module_name = "envoy_api",
34+
commit = "f75d37791e180ac9f5a09a9535ef912f0fb0bcc9",
35+
remote = "https://github.com/mmorel-35/envoy",
36+
strip_prefix = "api",
37+
)
38+
39+
git_override(
40+
module_name = "envoy_build_config",
41+
commit = "f75d37791e180ac9f5a09a9535ef912f0fb0bcc9",
42+
remote = "https://github.com/mmorel-35/envoy",
43+
strip_prefix = "mobile/envoy_build_config",
44+
)
45+
46+
git_override(
47+
module_name = "envoy_mobile",
48+
commit = "f75d37791e180ac9f5a09a9535ef912f0fb0bcc9",
49+
remote = "https://github.com/mmorel-35/envoy",
50+
strip_prefix = "mobile",
51+
)
52+
53+
git_override(
54+
module_name = "toolchains_llvm",
55+
commit = "fb29f3d53757790dad17b90df0794cea41f1e183",
56+
remote = "https://github.com/bazel-contrib/toolchains_llvm",
57+
)
58+
59+
# LLVM extension removed - can only be used by root module.
60+
# The LLVM toolchain will be configured by the root module (envoy).
61+
# See: https://github.com/mmorel-35/envoy/blob/copilot/document-bzlmod-migration/docs/bzlmod_migration.md#blocker-2-llvm-extension-in-envoy_example_wasm_cc

wasm-cc/MODULE.bazel.lock

Lines changed: 3106 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)