Skip to content

Commit 690d194

Browse files
committed
auto-merge envoyproxy/envoy[release/v1.32] into envoyproxy/envoy-openssl[release/v1.32]
* upstream/release/v1.32: repo: Dev v1.32.6 (#38915) repo: Release v1.32.5 changelogs: Add for container update ci: Switch ARM to RBE (#38860) build(deps): bump distroless/base-nossl-debian12 from `e9554da` to `462657c` in /ci (#38794) repo: Dev v1.32.5 (#38838) Signed-off-by: tedjpoole <[email protected]>
2 parents eeacbb6 + d4b45a2 commit 690d194

28 files changed

+5189
-360
lines changed

.bazelrc

+14
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
200200
build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
201201
build:libc++ --define force_libcpp=enabled
202202
build:clang-libc++ --config=libc++
203+
build:arm64-clang-libc++ --config=clang-libc++
203204

204205
build:libc++20 --config=libc++
205206
# gRPC has a lot of deprecated-enum-enum-conversion warning. Remove once it is addressed
@@ -269,6 +270,16 @@ build:rbe-toolchain-clang-libc++ --action_env=CXXFLAGS=-stdlib=libc++
269270
build:rbe-toolchain-clang-libc++ --action_env=LDFLAGS=-stdlib=libc++
270271
build:rbe-toolchain-clang-libc++ --define force_libcpp=enabled
271272

273+
build:rbe-toolchain-arm64-clang-libc++ --config=rbe-toolchain
274+
build:rbe-toolchain-arm64-clang-libc++ --platforms=@envoy//bazel/rbe/toolchains:rbe_linux_arm64_clang_libcxx_platform
275+
build:rbe-toolchain-arm64-clang-libc++ --host_platform=@envoy//bazel/rbe/toolchains:rbe_linux_arm64_clang_libcxx_platform
276+
build:rbe-toolchain-arm64-clang-libc++ --crosstool_top=@envoy//bazel/rbe/toolchains/configs/linux/clang_libcxx/cc:toolchain
277+
build:rbe-toolchain-arm64-clang-libc++ --extra_toolchains=@envoy//bazel/rbe/toolchains/configs/linux/clang_libcxx/config:cc-toolchain-arm64
278+
build:rbe-toolchain-arm64-clang-libc++ --action_env=CC=clang --action_env=CXX=clang++
279+
build:rbe-toolchain-arm64-clang-libc++ --action_env=CXXFLAGS=-stdlib=libc++
280+
build:rbe-toolchain-arm64-clang-libc++ --action_env=LDFLAGS=-stdlib=libc++
281+
build:rbe-toolchain-arm64-clang-libc++ --define force_libcpp=enabled
282+
272283
build:rbe-toolchain-asan --config=clang-asan
273284
build:rbe-toolchain-asan --linkopt -fuse-ld=lld
274285
build:rbe-toolchain-asan --action_env=ENVOY_UBSAN_VPTR=1
@@ -313,6 +324,9 @@ build:remote-clang --config=rbe-toolchain-clang
313324
build:remote-clang-libc++ --config=remote
314325
build:remote-clang-libc++ --config=rbe-toolchain-clang-libc++
315326

327+
build:remote-arm64-clang-libc++ --config=remote
328+
build:remote-arm64-clang-libc++ --config=rbe-toolchain-arm64-clang-libc++
329+
316330
build:remote-gcc --config=remote
317331
build:remote-gcc --config=gcc
318332
build:remote-gcc --config=rbe-toolchain-gcc

.github/workflows/_precheck_publish.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ jobs:
6161
name: Release (arm64)
6262
target-suffix: arm64
6363
arch: arm64
64-
bazel-extra: >-
65-
--config=remote-cache-envoy-engflow
66-
rbe: false
67-
runs-on: envoy-arm64-large
64+
rbe: true
65+
runs-on: ${{ vars.ENVOY_ARM_VM || 'ubuntu-24.04-arm' }}
6866
timeout-minutes: 180
6967
- target: docs
7068
name: Docs

.github/workflows/_publish_build.yml

-185
This file was deleted.

.github/workflows/_publish_verify.yml

-136
This file was deleted.

VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.32.4
1+
1.32.6-dev

bazel/BUILD

+8
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,14 @@ config_setting(
746746
define_values = {"engflow_rbe": "true"},
747747
)
748748

749+
selects.config_setting_group(
750+
name = "engflow_rbe_x86_64",
751+
match_all = [
752+
":engflow_rbe",
753+
":linux_x86_64",
754+
],
755+
)
756+
749757
selects.config_setting_group(
750758
name = "apple",
751759
match_any = [

bazel/envoy_binary.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def envoy_cc_binary(
3030
features = [],
3131
linkstatic = True):
3232
exec_properties = exec_properties | select({
33-
repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
33+
repository + "//bazel:engflow_rbe_x86_64": {"Pool": rbe_pool} if rbe_pool else {},
3434
"//conditions:default": {},
3535
})
3636
linker_inputs = envoy_exported_symbols_input()

0 commit comments

Comments
 (0)