Skip to content

bazel: Bump deps and cleanup flags #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlax merged 1 commit into from
Oct 9, 2026
Merged

bazel: Bump deps and cleanup flags #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.8.0
8.8.1
1 change: 1 addition & 0 deletions .github/workflows/repo.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
40 changes: 12 additions & 28 deletions filter-cc/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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=
Expand All @@ -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
1 change: 0 additions & 1 deletion filter-cc/.bazelversion
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions filter-cc/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../.bazelversion
4 changes: 2 additions & 2 deletions filter-cc/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
26 changes: 1 addition & 25 deletions wasm-cc/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion wasm-cc/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
Loading