Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 27 additions & 27 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -125,23 +125,23 @@ build:remote-ci-linux --incompatible_strict_action_env=true
build:remote-ci-linux --remote_timeout=600
# GCC toolchain options
build:remote-ci-linux --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote-ci-linux --crosstool_top=@engflow_remote_config//cc:toolchain
build:remote-ci-linux --extra_execution_platforms=@engflow_remote_config//config:platform
build:remote-ci-linux --extra_toolchains=@engflow_remote_config//config:cc-toolchain
build:remote-ci-linux --host_platform=@engflow_remote_config//config:platform
build:remote-ci-linux --platforms=@engflow_remote_config//config:platform
build:remote-ci-linux --crosstool_top=//third_party/rbe_configs/cc:toolchain
build:remote-ci-linux --extra_execution_platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux --extra_toolchains=//third_party/rbe_configs/config:cc-toolchain
build:remote-ci-linux --host_platform=//third_party/rbe_configs/config:platform
build:remote-ci-linux --platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux --config=remote-ci-common
#############################################################################
# remote-ci-linux-clang: These options are linux-only using Clang by default
#############################################################################
build:remote-ci-linux-clang --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote-ci-linux-clang --action_env=CC=/opt/llvm/bin/clang
build:remote-ci-linux-clang --action_env=CXX=/opt/llvm/bin/clang++
build:remote-ci-linux-clang --crosstool_top=@engflow_remote_config_clang//cc:toolchain
build:remote-ci-linux-clang --extra_execution_platforms=@engflow_remote_config_clang//config:platform
build:remote-ci-linux-clang --extra_toolchains=@engflow_remote_config_clang//config:cc-toolchain
build:remote-ci-linux-clang --host_platform=@engflow_remote_config_clang//config:platform
build:remote-ci-linux-clang --platforms=@engflow_remote_config_clang//config:platform
build:remote-ci-linux-clang --crosstool_top=//third_party/rbe_configs/cc:toolchain
build:remote-ci-linux-clang --extra_execution_platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux-clang --extra_toolchains=//third_party/rbe_configs/config:cc-toolchain
build:remote-ci-linux-clang --host_platform=//third_party/rbe_configs/config:platform
build:remote-ci-linux-clang --platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux-clang --config=remote-ci-common
#############################################################################
# remote-ci-linux-asan: These options are Linux-only using Clang and AddressSanitizer
Expand All @@ -150,11 +150,11 @@ build:remote-ci-linux-asan --config=clang-asan
build:remote-ci-linux-asan --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote-ci-linux-asan --action_env=CC=/opt/llvm/bin/clang
build:remote-ci-linux-asan --action_env=CXX=/opt/llvm/bin/clang++
build:remote-ci-linux-asan --crosstool_top=@engflow_remote_config_clang_asan//cc:toolchain
build:remote-ci-linux-asan --extra_execution_platforms=@engflow_remote_config_clang_asan//config:platform
build:remote-ci-linux-asan --extra_toolchains=@engflow_remote_config_clang_asan//config:cc-toolchain
build:remote-ci-linux-asan --host_platform=@engflow_remote_config_clang_asan//config:platform
build:remote-ci-linux-asan --platforms=@engflow_remote_config_clang_asan//config:platform
build:remote-ci-linux-asan --crosstool_top=//third_party/rbe_configs/cc:toolchain
build:remote-ci-linux-asan --extra_execution_platforms=//third_party/rbe_configs/config:platform-asan
build:remote-ci-linux-asan --extra_toolchains=//third_party/rbe_configs/config:cc-toolchain
build:remote-ci-linux-asan --host_platform=//third_party/rbe_configs/config:platform-asan
build:remote-ci-linux-asan --platforms=//third_party/rbe_configs/config:platform-asan
build:remote-ci-linux-asan --config=remote-ci-common
#############################################################################
# remote-ci-linux-tsan: These options are Linux-only using Clang and ThreadSanitizer
Expand All @@ -163,11 +163,11 @@ build:remote-ci-linux-tsan --config=clang-tsan
build:remote-ci-linux-tsan --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote-ci-linux-tsan --action_env=CC=/opt/llvm/bin/clang
build:remote-ci-linux-tsan --action_env=CXX=/opt/llvm/bin/clang++
build:remote-ci-linux-tsan --crosstool_top=@engflow_remote_config_clang_asan//cc:toolchain
build:remote-ci-linux-tsan --extra_execution_platforms=@engflow_remote_config_clang_asan//config:platform
build:remote-ci-linux-tsan --extra_toolchains=@engflow_remote_config_clang_asan//config:cc-toolchain
build:remote-ci-linux-tsan --host_platform=@engflow_remote_config_clang_asan//config:platform
build:remote-ci-linux-tsan --platforms=@engflow_remote_config_clang_asan//config:platform
build:remote-ci-linux-tsan --crosstool_top=//third_party/rbe_configs/cc:toolchain
build:remote-ci-linux-tsan --extra_execution_platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux-tsan --extra_toolchains=//third_party/rbe_configs/config:cc-toolchain
build:remote-ci-linux-tsan --host_platform=//third_party/rbe_configs/config:platform
build:remote-ci-linux-tsan --platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux-tsan --config=remote-ci-common
#############################################################################
# remote-ci-linux-local-java8: These options are linux-only using a local Java 8 (JDK)
Expand All @@ -179,25 +179,25 @@ build:remote-ci-linux-local-java8 --config=remote-ci-common
#############################################################################
# remote-ci-linux-coverage: These options are Linux-only using Clang and LLVM coverage
#############################################################################
# Clang environment variables (keep in sync with @engflow_remote_config_clang_coverage)
# Clang environment variables (keep in sync with //third_party/rbe_configs)
build:remote-ci-linux-coverage --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote-ci-linux-coverage --action_env=CC=/opt/llvm/bin/clang
build:remote-ci-linux-coverage --test_env=CC=/opt/llvm/bin/clang
build:remote-ci-linux-coverage --action_env=CXX=/opt/llvm/bin/clang++
build:remote-ci-linux-coverage --test_env=CXX=/opt/llvm/bin/clang++
# Coverage environment variables (keep in sync with @engflow_remote_config_clang_coverage)
# Coverage environment variables (keep in sync with //third_party/rbe_configs)
build:remote-ci-linux-coverage --action_env=GCOV=/opt/llvm/bin/llvm-profdata
build:remote-ci-linux-coverage --test_env=GCOV=/opt/llvm/bin/llvm-profdata
build:remote-ci-linux-coverage --action_env=BAZEL_LLVM_COV=/opt/llvm/bin/llvm-cov
build:remote-ci-linux-coverage --test_env=BAZEL_LLVM_COV=/opt/llvm/bin/llvm-cov
build:remote-ci-linux-coverage --action_env=BAZEL_USE_LLVM_NATIVE_COVERAGE=1
build:remote-ci-linux-coverage --test_env=BAZEL_USE_LLVM_NATIVE_COVERAGE=1
# Toolchain flags (Java is required for C++ coverage due to Bazel's LCOV merger)
build:remote-ci-linux-coverage --crosstool_top=@engflow_remote_config_clang_coverage//cc:toolchain
build:remote-ci-linux-coverage --extra_execution_platforms=@engflow_remote_config_clang_coverage//config:platform
build:remote-ci-linux-coverage --extra_toolchains=@engflow_remote_config_clang_coverage//config:cc-toolchain
build:remote-ci-linux-coverage --host_platform=@engflow_remote_config_clang_coverage//config:platform
build:remote-ci-linux-coverage --platforms=@engflow_remote_config_clang_coverage//config:platform
build:remote-ci-linux-coverage --crosstool_top=//third_party/rbe_configs/cc:toolchain
build:remote-ci-linux-coverage --extra_execution_platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux-coverage --extra_toolchains=//third_party/rbe_configs/config:cc-toolchain
build:remote-ci-linux-coverage --host_platform=//third_party/rbe_configs/config:platform
build:remote-ci-linux-coverage --platforms=//third_party/rbe_configs/config:platform
build:remote-ci-linux-coverage --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
build:remote-ci-linux-coverage --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
# Flags to run tests locally which are necessary since Bazel C++ LLVM coverage isn't fully supported for remote builds
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: '(/certificates.inc$)|(test/.*/testing/data/)'
exclude: '(^third_party/rbe_configs/cc/module.modulemap$)|(/certificates.inc$)|(test/.*/testing/data/)'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.1.0
Expand Down
75 changes: 0 additions & 75 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -42,78 +42,3 @@ declare_python_abi(name = "python_abi", python_version = "3")

android_sdk_repository(name = "androidsdk", api_level = 30, build_tools_version = "30.0.2")
android_ndk_repository(name = "androidndk", api_level = 21)

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "bazel_toolchains",
commit = "810ac3490df9113cfaa50a4ee3d204a29c81a24c",
remote = "https://github.com/bazelbuild/bazel-toolchains.git",
)

load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")

rbe_autoconfig(
name = "engflow_remote_config",
digest = "sha256:b4fe088084579339ae8f7a44af899bbebd86a290af56e5ab7cc85ca99a09499c",
registry = "docker.io",
repository = "envoyproxy/envoy-build-ubuntu",
use_legacy_platform_definition = False,
create_java_configs = False,
exec_properties = {
"Pool": "linux",
},
)

rbe_autoconfig(
name = "engflow_remote_config_clang",
digest = "sha256:b4fe088084579339ae8f7a44af899bbebd86a290af56e5ab7cc85ca99a09499c",
registry = "docker.io",
repository = "envoyproxy/envoy-build-ubuntu",
use_legacy_platform_definition = False,
env = {
"CC": "/opt/llvm/bin/clang",
"CXX": "/opt/llvm/bin/clang++",
},
exec_properties = {
"Pool": "linux",
},
create_java_configs = False,
)

rbe_autoconfig(
name = "engflow_remote_config_clang_asan",
digest = "sha256:b4fe088084579339ae8f7a44af899bbebd86a290af56e5ab7cc85ca99a09499c",
registry = "docker.io",
repository = "envoyproxy/envoy-build-ubuntu",
use_legacy_platform_definition = False,
env = {
"CC": "/opt/llvm/bin/clang",
"CXX": "/opt/llvm/bin/clang++",
},
exec_properties = {
"Pool": "linux",
# Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the
# docker container fail tests on teardown (example: https://github.com/envoyproxy/envoy-mobile/runs/3443649963)
"dockerAddCapabilities": "SYS_PTRACE",
},
)

rbe_autoconfig(
name = "engflow_remote_config_clang_coverage",
digest = "sha256:b4fe088084579339ae8f7a44af899bbebd86a290af56e5ab7cc85ca99a09499c",
registry = "docker.io",
repository = "envoyproxy/envoy-build-ubuntu",
use_legacy_platform_definition = False,
env = {
"CC": "/opt/llvm/bin/clang",
"CXX": "/opt/llvm/bin/clang++",
"GCOV": "/opt/llvm/bin/llvm-profdata",
"BAZEL_LLVM_COV": "/opt/llvm/bin/llvm-cov",
"BAZEL_USE_LLVM_NATIVE_COVERAGE": "1",
},
exec_properties = {
"Pool": "linux",
},
create_java_configs = False,
)
Loading