diff --git a/.bazelrc b/.bazelrc index c52e51bb..f4f1a2b6 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,4 +1,4 @@ -common --enable_bzlmod=0 +common --enable_bzlmod common --color=yes common:ci --noshow_progress common:ci --noshow_loading_progress diff --git a/.bazelversion b/.bazelversion index 93c8ddab..e8be6840 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.6.0 +7.6.1 diff --git a/.gitignore b/.gitignore index 87245975..97a641c9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,12 +25,11 @@ !\.zuul.yaml /bazel-* -/mobile/bazel-* +MODULE.bazel.lock BROWSE /build /build_* *.bzlc -/ci/bazel-* compile_commands.json cscope.* /docs/landing_source/.bundle diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 00000000..d03ff627 --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,89 @@ +module( + name = "envoy_examples", + version = "0.0.0-dev", +) + +bazel_dep(name = "bazel_skylib", version = "1.8.1") +bazel_dep(name = "envoy", version = "0.0.0-dev") +git_override( + module_name = "envoy", + commit = "9416048f843abbbd6a467e2e75574cac81d13d1c", + remote = "https://github.com/mmorel-35/envoy.git", +) + +bazel_dep(name = "envoy_api", version = "0.0.0-dev") +git_override( + module_name = "envoy_api", + commit = "9416048f843abbbd6a467e2e75574cac81d13d1c", + remote = "https://github.com/mmorel-35/envoy.git", + strip_prefix = "api", +) + +bazel_dep(name = "envoy_build_config", version = "0.0.0-dev") +git_override( + module_name = "envoy_build_config", + commit = "9416048f843abbbd6a467e2e75574cac81d13d1c", + remote = "https://github.com/mmorel-35/envoy.git", + strip_prefix = "mobile/envoy_build_config", +) + +bazel_dep(name = "envoy-example-wasmcc", version = "0.0.0-dev") +local_path_override( + module_name = "envoy-example-wasmcc", + path = "wasm-cc", +) + +bazel_dep(name = "envoy_toolshed", version = "0.3.3") +git_override( + module_name = "envoy_toolshed", + commit = "f536601588f6a523346091adb3420d39b4692d3a", + remote = "https://github.com/envoyproxy/toolshed.git", + strip_prefix = "bazel", +) + +bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle") +bazel_dep(name = "googleurl", version = "0.0.0-dev", repo_name = "com_googlesource_googleurl") +git_override( + module_name = "googleurl", + commit = "e6c272102e0554e02c1bb317edff927ee56c7d0b", + remote = "https://quiche.googlesource.com/googleurl", +) + +bazel_dep(name = "rules_cc", version = "0.2.2") +bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_pkg", version = "1.1.0") +bazel_dep(name = "rules_python", version = "1.4.1") +bazel_dep(name = "rules_rust", version = "0.63.0") +# -- bazel_dep definitions -- # + +go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True) +go_sdk.download(version = "1.24.1") +use_repo( + go_sdk, + go_sdk = "go_default_sdk", +) + +go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps", dev_dependency = True) +go_deps.from_file( + go_mod = "//golang-network/simple:go.mod", +) +use_repo( + go_deps, + "com_github_cncf_xds_go", + "com_github_envoyproxy_envoy", + "org_golang_google_protobuf", +) + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") +python.toolchain( + is_default = True, + python_version = "3.12", +) +use_repo( + python, + "python_3_12", + python = "python_versions", +) +# -- use_repo_rule statements -- # + +# -- repo definitions -- # diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod new file mode 100644 index 00000000..60876735 --- /dev/null +++ b/WORKSPACE.bzlmod @@ -0,0 +1 @@ +workspace(name = "envoy_examples") diff --git a/golang-network/simple/BUILD b/golang-network/simple/BUILD index ac7b55fe..d496789b 100644 --- a/golang-network/simple/BUILD +++ b/golang-network/simple/BUILD @@ -13,8 +13,8 @@ go_binary( linkmode = "c-shared", visibility = ["//visibility:public"], deps = [ - "//contrib/golang/common/go/api", - "//contrib/golang/filters/network/source/go/pkg/network", + "@envoy//contrib/golang/common/go/api", + "@envoy//contrib/golang/filters/network/source/go/pkg/network", "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", ], diff --git a/golang-network/simple/go.mod b/golang-network/simple/go.mod index 8aa66e29..5588d534 100644 --- a/golang-network/simple/go.mod +++ b/golang-network/simple/go.mod @@ -7,14 +7,14 @@ toolchain go1.24.1 // NOTICE: these lines could be generated automatically by "go mod tidy" require ( - github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa + github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 github.com/envoyproxy/envoy v1.34.3 google.golang.org/protobuf v1.36.6 ) require ( - github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect + github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect github.com/golang/protobuf v1.5.3 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect ) diff --git a/golang-network/simple/go.sum b/golang-network/simple/go.sum index 45582fcd..d8068389 100644 --- a/golang-network/simple/go.sum +++ b/golang-network/simple/go.sum @@ -1,9 +1,12 @@ github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= +github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls= +github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/envoyproxy/envoy v1.34.3 h1:nN+nIXyG3/n+FmnRsSCLEKK16wdeYIdbGxuZPbdRWlc= github.com/envoyproxy/envoy v1.34.3/go.mod h1:A/vRPuqivdZBAr0NfT3sccV8KtY07B2PyvILAdV0qCU= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -15,6 +18,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= diff --git a/wasm-cc/.bazelrc b/wasm-cc/.bazelrc index 7f7fc81a..80af45de 100644 --- a/wasm-cc/.bazelrc +++ b/wasm-cc/.bazelrc @@ -1,4 +1,4 @@ -common --enable_bzlmod=0 +common --enable_bzlmod common --color=yes common:ci --noshow_progress common:ci --noshow_loading_progress diff --git a/wasm-cc/.bazelversion b/wasm-cc/.bazelversion index 93c8ddab..e8be6840 100644 --- a/wasm-cc/.bazelversion +++ b/wasm-cc/.bazelversion @@ -1 +1 @@ -7.6.0 +7.6.1 diff --git a/wasm-cc/MODULE.bazel b/wasm-cc/MODULE.bazel new file mode 100644 index 00000000..38614b85 --- /dev/null +++ b/wasm-cc/MODULE.bazel @@ -0,0 +1,97 @@ +module( + name = "envoy-example-wasmcc", + version = "0.0.0-dev", +) + +bazel_dep(name = "aspect_bazel_lib", version = "2.16.0") +bazel_dep(name = "bazel_skylib", version = "1.8.1") +bazel_dep(name = "emsdk", version = "4.0.13") +bazel_dep(name = "envoy", version = "0.0.0-dev") +git_override( + module_name = "envoy", + commit = "9416048f843abbbd6a467e2e75574cac81d13d1c", + remote = "https://github.com/mmorel-35/envoy.git", +) + +bazel_dep(name = "envoy_api", version = "0.0.0-dev") +git_override( + module_name = "envoy_api", + commit = "9416048f843abbbd6a467e2e75574cac81d13d1c", + remote = "https://github.com/mmorel-35/envoy.git", + strip_prefix = "api", +) + +bazel_dep(name = "envoy_examples", version = "0.0.0-dev") +local_path_override( + module_name = "envoy_examples", + path = "..", +) + +bazel_dep(name = "envoy_build_config", version = "0.0.0-dev") +git_override( + module_name = "envoy_build_config", + commit = "9416048f843abbbd6a467e2e75574cac81d13d1c", + remote = "https://github.com/mmorel-35/envoy.git", + strip_prefix = "mobile/envoy_build_config", +) + +bazel_dep(name = "envoy_toolshed", version = "0.3.3") +git_override( + module_name = "envoy_toolshed", + commit = "f536601588f6a523346091adb3420d39b4692d3a", + remote = "https://github.com/envoyproxy/toolshed.git", + strip_prefix = "bazel", +) + +bazel_dep(name = "googleurl", version = "0.0.0-dev", repo_name = "com_googlesource_googleurl") +git_override( + module_name = "googleurl", + commit = "e6c272102e0554e02c1bb317edff927ee56c7d0b", + remote = "https://quiche.googlesource.com/googleurl", +) + +bazel_dep(name = "rules_cc", version = "0.2.2") +bazel_dep(name = "rules_foreign_cc", version = "0.15.0") +bazel_dep(name = "rules_perl", version = "0.4.1") +bazel_dep(name = "rules_pkg", version = "1.1.0") +bazel_dep(name = "rules_python", version = "1.4.1") +bazel_dep(name = "rules_rust", version = "0.63.0") +bazel_dep(name = "rules_fuzzing", version = "0.6.0") +bazel_dep(name = "toolchains_llvm", version = "1.4.0") +# -- bazel_dep definitions -- # + +llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True) +llvm.toolchain(llvm_version = "18.1.8") +use_repo(llvm, "llvm_toolchain") + +register_toolchains( + "@llvm_toolchain//:all", + dev_dependency = True, +) + +tools = use_extension("@rules_foreign_cc//foreign_cc:extensions.bzl", "tools") +use_repo( + tools, + "cmake_3.31.7_toolchains", + "ninja_1.12.1_toolchains", +) + +register_toolchains( + "@cmake_3.31.7_toolchains//:all", + "@ninja_1.12.1_toolchains//:all", + "@rules_foreign_cc//toolchains:all", +) + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") +python.toolchain( + is_default = True, + python_version = "3.12", +) +use_repo( + python, + "python_3_12", + python = "python_versions", +) +# -- use_repo_rule statements -- # + +# -- repo definitions -- # diff --git a/wasm-cc/WORKSPACE.bzlmod b/wasm-cc/WORKSPACE.bzlmod new file mode 100644 index 00000000..4107be03 --- /dev/null +++ b/wasm-cc/WORKSPACE.bzlmod @@ -0,0 +1 @@ +workspace(name = "envoy-example-wasmcc") diff --git a/wasm-cc/bazel/packages.bzl b/wasm-cc/bazel/packages.bzl index b6ee9b76..fed764d5 100644 --- a/wasm-cc/bazel/packages.bzl +++ b/wasm-cc/bazel/packages.bzl @@ -10,9 +10,9 @@ def load_envoy_example_wasmcc_packages(): pip_parse( name = "toolshed_pip3", requirements_lock = "@envoy_toolshed//:requirements.txt", - python_interpreter_target = "@python3_12_host//:python", + python_interpreter_target = "@python_3_12//:python", ) bazel_features_deps() - emscripten_deps(emscripten_version = "4.0.6") + emscripten_deps(emscripten_version = "4.0.13") default_envoy_build_config(name = "envoy_build_config") proto_bazel_features(name = "proto_bazel_features")