From 69373fbd2893c45d42efa6a9b5ba51a8a2e312c0 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Fri, 9 Oct 2026 12:57:19 +0100 Subject: [PATCH] bazel: Bump deps and cleanup flags Signed-off-by: Ryan Northey --- .bazelrc | 30 +++++-------------------- .bazelversion | 2 +- .github/workflows/repo.bazelrc | 1 + MODULE.bazel | 2 +- filter-cc/.bazelrc | 40 ++++++++++------------------------ filter-cc/.bazelversion | 2 +- filter-cc/MODULE.bazel | 4 ++-- wasm-cc/.bazelrc | 26 +--------------------- wasm-cc/MODULE.bazel | 2 +- 9 files changed, 26 insertions(+), 83 deletions(-) mode change 100644 => 120000 filter-cc/.bazelversion diff --git a/.bazelrc b/.bazelrc index 33e8bfe4..afda3bab 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,9 +1,7 @@ common --color=yes common --registry=https://bcr.bazel.build -common --registry=https://raw.githubusercontent.com/envoyproxy/bazel-registry/07050c5e9f805a6d60bdad5e5bc30ca478fa844e - -common --config=clang +common --registry=https://raw.githubusercontent.com/envoyproxy/bazel-registry/5db29c09de17218d24f58c665be38208284754d8 common:examples --action_env=DEV_CONTAINER_ID common:examples --host_action_env=DEV_CONTAINER_ID @@ -17,30 +15,14 @@ common:examples --action_env=BUILDKIT_PROGRESS common:examples --host_action_env=BUILDKIT_PROGRESS common:examples --action_env=USER_UID common:examples --host_action_env=USER_UID -common:examples --sandbox_writable_path=/var/run/docker.sock - -common --@rules_python//python/config_settings:bootstrap_impl=script +common:examples --action_env="BUILDX_BAKE_ENTITLEMENTS_FS=0" +common:examples --host_action_env="BUILDX_BAKE_ENTITLEMENTS_FS=0" -# libc++ - default for clang -common:libc++ --action_env=CXXFLAGS=-stdlib=libc++ -common:libc++ --action_env=LDFLAGS="-stdlib=libc++ -fuse-ld=lld" -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 +common:examples --sandbox_writable_path=/var/run/docker.sock -# Common flags for Clang (shared between all clang variants) -common:clang-common --linkopt=-fuse-ld=lld -common:clang-common --cxxopt=-Wno-nullability-completeness -common:clang-common --@toolchains_llvm//toolchain/config:compiler-rt=false -common:clang-common --@toolchains_llvm//toolchain/config:libunwind=false +common:examples --host_platform=@clang_platform -# Clang with libc++ (default) -common:clang --config=clang-common -common:clang --config=libc++ -common:clang --host_platform=@clang_platform -common:clang --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 +common --@rules_python//python/config_settings:bootstrap_impl=script try-import %workspace%/user.bazelrc try-import %workspace%/repo.bazelrc diff --git a/.bazelversion b/.bazelversion index 3b682537..eec6dacb 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -8.8.0 +8.8.1 diff --git a/.github/workflows/repo.bazelrc b/.github/workflows/repo.bazelrc index f43953a7..7f5ad3bd 100644 --- a/.github/workflows/repo.bazelrc +++ b/.github/workflows/repo.bazelrc @@ -36,3 +36,4 @@ common:remote-cache --remote_timeout=3600s 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 diff --git a/MODULE.bazel b/MODULE.bazel index 2fd36982..3f09023f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -4,7 +4,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.9.2") -bazel_dep(name = "envoy", version = "1.40.0-dev.20260927.5f95744.envoy") +bazel_dep(name = "envoy", version = "1.40.0-dev.20261009.189f198.envoy") bazel_dep(name = "envoy-example-filter-cc", version = "0.2.7") bazel_dep(name = "envoy-example-wasm-cc", version = "0.2.7") bazel_dep(name = "rules_pkg", version = "1.3.0") diff --git a/filter-cc/.bazelrc b/filter-cc/.bazelrc index 4c073d6f..beccabd9 100644 --- a/filter-cc/.bazelrc +++ b/filter-cc/.bazelrc @@ -1,13 +1,22 @@ common --color=yes common --registry=https://bcr.bazel.build/ -common --registry=https://raw.githubusercontent.com/envoyproxy/bazel-registry/07050c5e9f805a6d60bdad5e5bc30ca478fa844e +common --registry=https://raw.githubusercontent.com/envoyproxy/bazel-registry/5db29c09de17218d24f58c665be38208284754d8 + +build --@rules_rust//rust/settings:extra_exec_rustc_flags=-Clink-self-contained=no + +# Common flags for Clang (shared between all clang variants) +common --linkopt=-fuse-ld=lld +common --cxxopt=-Wno-nullability-completeness # Required by Envoy and its deps when consumed via bzlmod. common --noincompatible_disallow_empty_glob common --noincompatible_disallow_ctx_resolve_tools common --legacy_external_runfiles build --incompatible_strict_action_env +build --experimental_cc_static_library + +build --experimental_repository_downloader_retries=2 # Protobuf currently requires Java 11 toolchains (see protocolbuffers/protobuf#20760). build --java_runtime_version=remotejdk_11 @@ -16,12 +25,10 @@ build --java_language_version=11 build --tool_java_language_version=11 build --extra_toolchains=@envoy//bazel:envoy_java_toolchain_definition -# Silence absl log spam. +# Silence log spam. build --copt=-DABSL_MIN_LOG_LEVEL=4 -build --cxxopt=-std=c++20 --host_cxxopt=-std=c++20 build --copt=-Wno-deprecated-declarations -build --experimental_cc_static_library -build --experimental_repository_downloader_retries=2 +build --per_file_copt=external/c-ares.*@-Wno-unused-function # Prevent rules_jvm_external from trying to set up an Android toolchain. common --repo_env=ANDROID_HOME= @@ -39,28 +46,5 @@ common --@proxy-wasm-cpp-host//bazel:engine=disabled common --@rules_python//python/config_settings:bootstrap_impl=script build --incompatible_default_to_explicit_init_py -build --@rules_rust//rust/settings:extra_exec_rustc_flags=-Clink-self-contained=no - -# Common flags for Clang (shared between all clang variants) -common:clang-common --linkopt=-fuse-ld=lld -common:clang-common --cxxopt=-Wno-nullability-completeness - -# libc++ - default for clang -common:libc++ --action_env=CXXFLAGS=-stdlib=libc++ -common:libc++ --action_env=LDFLAGS="-stdlib=libc++ -fuse-ld=lld" -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 - -# Clang with libc++ (default) -common:clang --config=clang-common -common:clang --config=libc++ -common:clang --host_platform=@clang_platform -common:clang --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 - -common --config=clang - try-import %workspace%/user.bazelrc try-import %workspace%/repo.bazelrc diff --git a/filter-cc/.bazelversion b/filter-cc/.bazelversion deleted file mode 100644 index 3b682537..00000000 --- a/filter-cc/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.8.0 diff --git a/filter-cc/.bazelversion b/filter-cc/.bazelversion new file mode 120000 index 00000000..b3326049 --- /dev/null +++ b/filter-cc/.bazelversion @@ -0,0 +1 @@ +../.bazelversion \ No newline at end of file diff --git a/filter-cc/MODULE.bazel b/filter-cc/MODULE.bazel index 3b95b29e..49ea0a5f 100644 --- a/filter-cc/MODULE.bazel +++ b/filter-cc/MODULE.bazel @@ -3,8 +3,8 @@ module( version = "0.2.7", ) -bazel_dep(name = "envoy", version = "1.40.0-dev.20260927.5f95744.envoy") -bazel_dep(name = "envoy_api", version = "1.40.0-dev.20260927.5f95744.envoy") +bazel_dep(name = "envoy", version = "1.40.0-dev.20261009.189f198.envoy") +bazel_dep(name = "envoy_api", version = "1.40.0-dev.20261009.189f198.envoy") bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf") bazel_dep(name = "platforms", version = "1.1.0") bazel_dep(name = "protobuf", version = "35.1.bcr.envoy") diff --git a/wasm-cc/.bazelrc b/wasm-cc/.bazelrc index 7a98df83..3bb0d8e9 100644 --- a/wasm-cc/.bazelrc +++ b/wasm-cc/.bazelrc @@ -2,34 +2,10 @@ common --color=yes common --legacy_external_runfiles common --registry=https://bcr.bazel.build/ -common --registry=https://raw.githubusercontent.com/envoyproxy/bazel-registry/07050c5e9f805a6d60bdad5e5bc30ca478fa844e +common --registry=https://raw.githubusercontent.com/envoyproxy/bazel-registry/5db29c09de17218d24f58c665be38208284754d8 common --@rules_python//python/config_settings:bootstrap_impl=script - -common --config=clang - build --incompatible_default_to_explicit_init_py -# libc++ - default for clang -common:libc++ --action_env=CXXFLAGS=-stdlib=libc++ -common:libc++ --action_env=LDFLAGS="-stdlib=libc++ -fuse-ld=lld" -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 - -# Common flags for Clang (shared between all clang variants) -common:clang-common --linkopt=-fuse-ld=lld -common:clang-common --cxxopt=-Wno-nullability-completeness -common:clang-common --@toolchains_llvm//toolchain/config:compiler-rt=false -common:clang-common --@toolchains_llvm//toolchain/config:libunwind=false - -# Clang with libc++ (default) -common:clang --config=clang-common -common:clang --config=libc++ -common:clang --host_platform=@clang_platform -common:clang --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 - try-import %workspace%/user.bazelrc try-import %workspace%/repo.bazelrc diff --git a/wasm-cc/MODULE.bazel b/wasm-cc/MODULE.bazel index 54ee2a78..de40214e 100644 --- a/wasm-cc/MODULE.bazel +++ b/wasm-cc/MODULE.bazel @@ -4,7 +4,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.9.2") -bazel_dep(name = "envoy", version = "1.40.0-dev.20260927.5f95744.envoy") +bazel_dep(name = "envoy", version = "1.40.0-dev.20261009.189f198.envoy") bazel_dep(name = "rules_pkg", version = "1.3.0") bazel_dep(name = "rules_python", version = "2.3.3")