Repository navigation
Update Envoy to 4113c85 (Nov 05, 2026) - #1650
Conversation
05961aa to
1736299
Compare
tomjzzhang
left a comment
tomjzzhang
left a comment
There was a problem hiding this comment.
Thanks for update! Left a few small inline questions on .bazelrc, plus a couple of general questions:
- It looks like envoyproxy/envoy#48963 was missed/reverted in
ci/run_envoy_docker.sh(Step 8) — did that cause a CI issue with the minimalciimage, or should we syncci/run_envoy_docker.shas well? - It looks like Step 13 (
tools/code_format/config.yaml) was also missed (envoyproxy/envoy#39632 removed- bazel/rbe/toolchains/configs/)? - Could we update the PR description to match your latest commit message (which covers the GCC toolchain and
test_integration_basics.pychanges)?
| build:gcc --config=libstdc++ | ||
| # Select the opt-in GCC toolchain for target and execution configurations. | ||
| build:gcc --@envoy//bazel:use_gcc | ||
| build:gcc --host_platform=@clang_platform |
There was a problem hiding this comment.
Should we mark this with # unique (per Step 9 of updating_envoy_dependency.md) so future merge_from_envoy runs don't overwrite it?
| build:gcc --host_platform=@clang_platform | |
| build:gcc --host_platform=@clang_platform # unique |
| build:gcc --cxxopt=-Wno-dangling-reference | ||
| build:gcc --cxxopt=-Wno-nonnull-compare | ||
| build:gcc --cxxopt=-Wno-trigraphs | ||
| build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold |
There was a problem hiding this comment.
It looks like a couple of .bazelrc hunks from Step 10 (merge_from_envoy) were missed in this commit range — should we include them here?
- bazel: Switch to hermetic
gcctoolchains envoy#39632 removed thebuild:libstdc++block below (lines 195–197). - test: Unsize quic_protocol_integration_test and shrink its many-large… envoy#48962 added
build:msan --test_timeout=120,600,1500,4800underbuild:msan --config=sanitizer(around line 363).
| common:remote-exec --remote_executor=grpcs://mordenite.cluster.engflow.com | ||
| common:remote-exec --jobs=200 | ||
| common:remote-exec --define=engflow_rbe=true | ||
| common:remote-exec --host_platform=@clang_platform |
There was a problem hiding this comment.
Do we also need info:remote-exec --host_platform=@platforms//host here (matching Envoy's ci.bazelrc and info:clang on line 166) so bazel info --config=rbe doesn't fail before @clang_platform is fetched?
| common:remote-exec --host_platform=@clang_platform | |
| common:remote-exec --host_platform=@clang_platform | |
| info:remote-exec --host_platform=@platforms//host |
|
|
||
| Edit [MODULE.bazel](/MODULE.bazel): | ||
|
|
||
| Update the `ENVOY_COMMIT` variable with the target Envoy commit hash: |
There was a problem hiding this comment.
Nit: extra spaces and ).: at the end:
| Update the `ENVOY_COMMIT` variable with the target Envoy commit hash: | |
| Update `ENVOY_COMMIT` to the latest Envoy's commit from | |
| [this page](https://github.com/envoyproxy/envoy/commits/main) (clicking on the | |
| short commit id opens a page that contains the fully expanded commit id): |
Update Envoy dependency to envoyproxy/envoy@4113c85 (Nov 05, 2026). - Sync ENVOY_COMMIT, bazel_dep pins (envoy_toolshed), bazel-registry SHA in .bazelrc, tools/code_format/config.yaml, and Python requirements. - Sync build image SHAs and docker runner in .github/config.yml, ci/envoy_build_sha.sh, and ci/run_envoy_docker.sh (with ENVOY_DOCKER_DEVTOOLS=1 in _ci.yml). - Register downstream hermetic GCC toolchain following upstream Envoy toolchain migration (envoyproxy/envoy#39632). - Set --host_platform=@clang_platform for GCC and remote execution in .bazelrc, and update GCC CI linker flag from gold's --no-threads to lld's --threads=1. - Increase output format test durations in test_integration_basics.py for TSAN stability. - Update docs/root/updating_envoy_dependency.md to clarify ENVOY_COMMIT update instructions. Signed-off-by: fei-deng <101672975+fei-deng@users.noreply.github.com>
|
Thanks for the thorough review! Addressed all comments: Synced ci/run_envoy_docker.sh with envoyproxy/envoy#48963 and set ENVOY_DOCKER_DEVTOOLS: '1' in .github/workflows/_ci.yml (the minimal ci image lacks host python3, which caused bazel run //tools:check_envoy_includes.py in check_format to fail). |
Update Envoy dependency to envoyproxy/envoy@4113c85 (Nov 05, 2026).