From 8fae8ab668e78fa8a4f40b0649331858e93d0fd1 Mon Sep 17 00:00:00 2001 From: istio-testing Date: Fri, 14 Nov 2025 14:53:38 +0000 Subject: [PATCH] Automator: update envoy@ in istio/proxy@master --- WORKSPACE | 6 +++--- envoy.bazelrc | 34 ++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6a47821fec..a0479e6b32 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz` # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed. # -# Commit date: 2025-11-06 -ENVOY_SHA = "78cff0755120fdf87b5e06eb3cf7d283866a6d9b" +# Commit date: 2025-11-14 +ENVOY_SHA = "98561c509289c9924c4e62ff992e8b7a25f3d7fe" -ENVOY_SHA256 = "80d7204651620631af127a02102e2f3263d47d435ef9a4b503ba37191adf2c5b" +ENVOY_SHA256 = "bb0061899849b1a85e2c9483ec42d86a590836f9a58344293d4e3038f894aafc" ENVOY_ORG = "envoyproxy" diff --git a/envoy.bazelrc b/envoy.bazelrc index 8e172fb939..f3452fd4fc 100644 --- a/envoy.bazelrc +++ b/envoy.bazelrc @@ -10,6 +10,7 @@ # Startup options cannot be selected via config. # TODO: Adding just to test android startup --host_jvm_args=-Xmx3g +startup --host_jvm_args="-DBAZEL_TRACK_SOURCE_DIRECTORIES=1" common --noenable_bzlmod @@ -90,17 +91,18 @@ build --@com_googlesource_googleurl//build_config:system_icu=0 # Common flags for sanitizers build:sanitizer --define tcmalloc=disabled build:sanitizer --linkopt -ldl +test:sanitizer --build_tests_only # Common flags for Clang (shared between all clang variants) -build:clang-common --action_env=BAZEL_COMPILER=clang -build:clang-common --linkopt=-fuse-ld=lld -build:clang-common --action_env=CC=clang --host_action_env=CC=clang -build:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++ -build:clang-common --incompatible_enable_cc_toolchain_resolution=false +common:clang-common --action_env=BAZEL_COMPILER=clang +common:clang-common --linkopt=-fuse-ld=lld +common:clang-common --action_env=CC=clang --host_action_env=CC=clang +common:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++ +common:clang-common --incompatible_enable_cc_toolchain_resolution=false # Clang with libc++ (default) -build:clang --config=clang-common -build:clang --config=libc++ +common:clang --config=clang-common +common:clang --config=libc++ build:arm64-clang --config=clang @@ -220,13 +222,13 @@ build:msan --test_env=MSAN_SYMBOLIZER_PATH build:msan --copt -O1 build:msan --copt -fno-optimize-sibling-calls -build:libc++ --action_env=CXXFLAGS=-stdlib=libc++ -build:libc++ --action_env=LDFLAGS=-stdlib=libc++ -build:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++ -build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a -build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread -build:libc++ --define force_libcpp=enabled -build:libc++ --@envoy//bazel:libc++=true +common:libc++ --action_env=CXXFLAGS=-stdlib=libc++ +common:libc++ --action_env=LDFLAGS=-stdlib=libc++ +common:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++ +common:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a +common:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread +common:libc++ --define force_libcpp=enabled +common:libc++ --@envoy//bazel:libc++=true @@ -383,7 +385,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request # Docker sandbox # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8 -build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:f4a881a1205e8e6db1a57162faf3df7aed88eae8@sha256:b10346fe2eee41733dbab0e02322c47a538bf3938d093a5daebad9699860b814 +build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:014410eea358648b3493283e0a4cf6db263bb8e2@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker @@ -554,7 +556,7 @@ common:bes-envoy-engflow --bes_timeout=3600s common:bes-envoy-engflow --bes_upload_mode=fully_async common:bes-envoy-engflow --nolegacy_important_outputs common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com -common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:95d7afdea0f0f8881e88fa5e581db4f50907d0745ac8d90e00357ac1a316abe5 +common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f common:rbe-envoy-engflow --jobs=200 common:rbe-envoy-engflow --define=engflow_rbe=true