Skip to content

Move root bzlmod sibling overrides into CI and compose defaults #1401

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −21
Draft

Move root bzlmod sibling overrides into CI and compose defaults #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8750f
Initial plan
Copilot Sep 4, 2026
b6fff98
Inject root module sibling overrides in CI
Copilot Sep 4, 2026
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
16 changes: 16 additions & 0 deletions .github/workflows/_verify_examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,22 @@ jobs:
with:
path: /home/runner/.cache
key: ${{ runner.os }}-bazel-${{ hashFiles('examples/**/BUILD', 'examples/**/*bzl', 'examples/WORKSPACE') }}
- name: Inject bzlmod sibling overrides into MODULE.bazel
run: |
# The sibling example modules are checked out alongside this module in
# CI, so resolve them from the local tree rather than the registry.
cat >> MODULE.bazel <<'EOF'

local_path_override(
module_name = "envoy-example-filter-cc",
path = "filter-cc",
)
local_path_override(
module_name = "envoy-example-wasm-cc",
path = "wasm-cc",
)
EOF
working-directory: examples

- name: RBE auth check
id: rbe
Expand Down
20 changes: 0 additions & 20 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,3 @@ bazel_dep(name = "toolchains_llvm", version = "1.9.0.envoy", dev_dependency = Tr

envoy_toolchains_ext = use_extension("@envoy//bazel:extensions.bzl", "envoy_toolchains_extension")
use_repo(envoy_toolchains_ext, "clang_platform")

# local_path_override(
# module_name = "envoy",
# path = "../envoy",
# )
#
# local_path_override(
# module_name = "envoy_api",
# path = "../envoy/api",
# )

local_path_override(
module_name = "envoy-example-filter-cc",
path = "filter-cc",
)

local_path_override(
module_name = "envoy-example-wasm-cc",
path = "wasm-cc",
)
5 changes: 4 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ services:
- "${DOCKER_EXAMPLES_LOG:-/var/log/docker-examples}:/var/log/docker"
working_dir: /workspace/examples
environment:
BAZEL_BUILD_EXTRA_OPTIONS: "${BAZEL_BUILD_EXTRA_OPTIONS:-}"
BAZEL_BUILD_EXTRA_OPTIONS: >-
${BAZEL_BUILD_EXTRA_OPTIONS:-
--override_module=envoy-example-filter-cc=filter-cc
--override_module=envoy-example-wasm-cc=wasm-cc}
BUILD_UID: "${UID:-1000}"
USER_UID: "${UID:-1000}"
GROUP_UID: "${UID:-1000}"
Expand Down