22# This is necessary since this needs to be available before we can access # unique
33# the Envoy repository contents via Bazel. # unique
44 # unique
5- build:asan --test_timeout=900 # unique
6- build:tsan --test_timeout=3600 # unique
5+ build:asan --test_timeout=4800 # unique
6+ build:tsan --test_timeout=4800 # unique
7+ build:test_gcc --test_timeout=4800 # unique
78# See https://github.com/envoyproxy/nighthawk/issues/405 # unique
89build:macos --copt -UDEBUG # unique
910 # unique
@@ -18,6 +19,7 @@ build:macos --copt -UDEBUG
1819# The number 3G is chosen heuristically to both support large VM and small VM with RBE.
1920# Startup options cannot be selected via config.
2021# TODO: Adding just to test android
22+ startup --host_jvm_args=-Xmx3g
2123startup --host_jvm_args="-DBAZEL_TRACK_SOURCE_DIRECTORIES=1"
2224
2325common --noenable_bzlmod
@@ -109,15 +111,15 @@ build:sanitizer --linkopt -ldl
109111test:sanitizer --build_tests_only
110112
111113# Common flags for Clang (shared between all clang variants)
112- build :clang-common --action_env=BAZEL_COMPILER=clang
113- build :clang-common --linkopt=-fuse-ld=lld
114- build :clang-common --action_env=CC=clang --host_action_env=CC=clang
115- build :clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
116- build :clang-common --incompatible_enable_cc_toolchain_resolution=false
114+ common :clang-common --action_env=BAZEL_COMPILER=clang
115+ common :clang-common --linkopt=-fuse-ld=lld
116+ common :clang-common --action_env=CC=clang --host_action_env=CC=clang
117+ common :clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
118+ common :clang-common --incompatible_enable_cc_toolchain_resolution=false
117119
118120# Clang with libc++ (default)
119- build :clang --config=clang-common
120- build :clang --config=libc++
121+ common :clang --config=clang-common
122+ common :clang --config=libc++
121123
122124build:arm64-clang --config=clang
123125
@@ -239,13 +241,13 @@ build:msan --test_env=MSAN_SYMBOLIZER_PATH
239241build:msan --copt -O1
240242build:msan --copt -fno-optimize-sibling-calls
241243
242- build :libc++ --action_env=CXXFLAGS=-stdlib=libc++
243- build :libc++ --action_env=LDFLAGS=-stdlib=libc++
244- build :libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
245- build :libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
246- build :libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
247- build :libc++ --define force_libcpp=enabled
248- build :libc++ --@envoy//bazel:libc++=true
244+ common :libc++ --action_env=CXXFLAGS=-stdlib=libc++
245+ common :libc++ --action_env=LDFLAGS=-stdlib=libc++
246+ common :libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
247+ common :libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
248+ common :libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
249+ common :libc++ --define force_libcpp=enabled
250+ common :libc++ --@envoy//bazel:libc++=true
249251
250252
251253
@@ -402,7 +404,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
402404
403405# Docker sandbox
404406# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
405- build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:014410eea358648b3493283e0a4cf6db263bb8e2 @sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f
407+ build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:4ce0cb04f941fb89d475597a640176ae64070bb1 @sha256:de54e91a8d27623ffbd3fb9bd1aba8241567e41c0fb82b167128e3629c2ede18
406408build:docker-sandbox --spawn_strategy=docker
407409build:docker-sandbox --strategy=Javac=docker
408410build:docker-sandbox --strategy=Closure=docker
@@ -575,7 +577,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
575577common:bes-envoy-engflow --bes_upload_mode=fully_async
576578common:bes-envoy-engflow --nolegacy_important_outputs
577579common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
578- common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f
580+ common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:de54e91a8d27623ffbd3fb9bd1aba8241567e41c0fb82b167128e3629c2ede18
579581common:rbe-envoy-engflow --jobs=200
580582common:rbe-envoy-engflow --define=engflow_rbe=true
581583
0 commit comments