Skip to content

Commit 8fae8ab

Browse files
committed
Automator: update envoy@ in istio/proxy@master
1 parent 660bd52 commit 8fae8ab

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2222
# 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
2323
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
2424
#
25-
# Commit date: 2025-11-06
26-
ENVOY_SHA = "78cff0755120fdf87b5e06eb3cf7d283866a6d9b"
25+
# Commit date: 2025-11-14
26+
ENVOY_SHA = "98561c509289c9924c4e62ff992e8b7a25f3d7fe"
2727

28-
ENVOY_SHA256 = "80d7204651620631af127a02102e2f3263d47d435ef9a4b503ba37191adf2c5b"
28+
ENVOY_SHA256 = "bb0061899849b1a85e2c9483ec42d86a590836f9a58344293d4e3038f894aafc"
2929

3030
ENVOY_ORG = "envoyproxy"
3131

envoy.bazelrc

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# Startup options cannot be selected via config.
1111
# TODO: Adding just to test android
1212
startup --host_jvm_args=-Xmx3g
13+
startup --host_jvm_args="-DBAZEL_TRACK_SOURCE_DIRECTORIES=1"
1314

1415
common --noenable_bzlmod
1516

@@ -90,17 +91,18 @@ build --@com_googlesource_googleurl//build_config:system_icu=0
9091
# Common flags for sanitizers
9192
build:sanitizer --define tcmalloc=disabled
9293
build:sanitizer --linkopt -ldl
94+
test:sanitizer --build_tests_only
9395

9496
# Common flags for Clang (shared between all clang variants)
95-
build:clang-common --action_env=BAZEL_COMPILER=clang
96-
build:clang-common --linkopt=-fuse-ld=lld
97-
build:clang-common --action_env=CC=clang --host_action_env=CC=clang
98-
build:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
99-
build:clang-common --incompatible_enable_cc_toolchain_resolution=false
97+
common:clang-common --action_env=BAZEL_COMPILER=clang
98+
common:clang-common --linkopt=-fuse-ld=lld
99+
common:clang-common --action_env=CC=clang --host_action_env=CC=clang
100+
common:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
101+
common:clang-common --incompatible_enable_cc_toolchain_resolution=false
100102

101103
# Clang with libc++ (default)
102-
build:clang --config=clang-common
103-
build:clang --config=libc++
104+
common:clang --config=clang-common
105+
common:clang --config=libc++
104106

105107
build:arm64-clang --config=clang
106108

@@ -220,13 +222,13 @@ build:msan --test_env=MSAN_SYMBOLIZER_PATH
220222
build:msan --copt -O1
221223
build:msan --copt -fno-optimize-sibling-calls
222224

223-
build:libc++ --action_env=CXXFLAGS=-stdlib=libc++
224-
build:libc++ --action_env=LDFLAGS=-stdlib=libc++
225-
build:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
226-
build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
227-
build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
228-
build:libc++ --define force_libcpp=enabled
229-
build:libc++ --@envoy//bazel:libc++=true
225+
common:libc++ --action_env=CXXFLAGS=-stdlib=libc++
226+
common:libc++ --action_env=LDFLAGS=-stdlib=libc++
227+
common:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
228+
common:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
229+
common:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
230+
common:libc++ --define force_libcpp=enabled
231+
common:libc++ --@envoy//bazel:libc++=true
230232

231233

232234

@@ -383,7 +385,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
383385

384386
# Docker sandbox
385387
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
386-
build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:f4a881a1205e8e6db1a57162faf3df7aed88eae8@sha256:b10346fe2eee41733dbab0e02322c47a538bf3938d093a5daebad9699860b814
388+
build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:014410eea358648b3493283e0a4cf6db263bb8e2@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f
387389
build:docker-sandbox --spawn_strategy=docker
388390
build:docker-sandbox --strategy=Javac=docker
389391
build:docker-sandbox --strategy=Closure=docker
@@ -554,7 +556,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
554556
common:bes-envoy-engflow --bes_upload_mode=fully_async
555557
common:bes-envoy-engflow --nolegacy_important_outputs
556558
common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
557-
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:95d7afdea0f0f8881e88fa5e581db4f50907d0745ac8d90e00357ac1a316abe5
559+
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f
558560
common:rbe-envoy-engflow --jobs=200
559561
common:rbe-envoy-engflow --define=engflow_rbe=true
560562

0 commit comments

Comments
 (0)