From ec93d78f5a7a1b4b813489a4c1350fdd80519e46 Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Sun, 15 Aug 2021 01:31:01 +0000 Subject: [PATCH 1/9] Update RBE toolchan config Signed-off-by: Yan Avlasov --- .bazelrc | 44 +++++++++++++++++----------------- bazel/dependency_imports.bzl | 2 -- bazel/repository_locations.bzl | 6 ++--- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.bazelrc b/.bazelrc index 52382f91ec00b..25800d5336f9e 100644 --- a/.bazelrc +++ b/.bazelrc @@ -165,17 +165,17 @@ build:fuzz-coverage --run_under=@envoy//bazel/coverage:fuzz_coverage_wrapper.sh build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 build:rbe-toolchain-clang --config=rbe-toolchain -build:rbe-toolchain-clang --platforms=@rbe_ubuntu_clang//config:platform -build:rbe-toolchain-clang --host_platform=@rbe_ubuntu_clang//config:platform -build:rbe-toolchain-clang --crosstool_top=@rbe_ubuntu_clang//cc:toolchain -build:rbe-toolchain-clang --extra_toolchains=@rbe_ubuntu_clang//config:cc-toolchain +build:rbe-toolchain-clang --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_platform +build:rbe-toolchain-clang --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_platform +build:rbe-toolchain-clang --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang/bazel_3.7.2/cc:toolchain +build:rbe-toolchain-clang --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang/bazel_3.7.2/config:cc-toolchain build:rbe-toolchain-clang --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin build:rbe-toolchain-clang-libc++ --config=rbe-toolchain -build:rbe-toolchain-clang-libc++ --platforms=@rbe_ubuntu_clang_libcxx//config:platform -build:rbe-toolchain-clang-libc++ --host_platform=@rbe_ubuntu_clang_libcxx//config:platform -build:rbe-toolchain-clang-libc++ --crosstool_top=@rbe_ubuntu_clang_libcxx//cc:toolchain -build:rbe-toolchain-clang-libc++ --extra_toolchains=@rbe_ubuntu_clang_libcxx//config:cc-toolchain +build:rbe-toolchain-clang-libc++ --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform +build:rbe-toolchain-clang-libc++ --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform +build:rbe-toolchain-clang-libc++ --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_3.7.2/cc:toolchain +build:rbe-toolchain-clang-libc++ --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_3.7.2/config:cc-toolchain build:rbe-toolchain-clang-libc++ --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin build:rbe-toolchain-clang-libc++ --action_env=CXXFLAGS=-stdlib=libc++ build:rbe-toolchain-clang-libc++ --action_env=LDFLAGS=-stdlib=libc++ @@ -200,20 +200,20 @@ build:rbe-toolchain-tsan --linkopt=-Wl,-rpath,/opt/libcxx_tsan/lib build:rbe-toolchain-tsan --config=clang-tsan build:rbe-toolchain-gcc --config=rbe-toolchain -build:rbe-toolchain-gcc --platforms=@rbe_ubuntu_gcc//config:platform -build:rbe-toolchain-gcc --host_platform=@rbe_ubuntu_gcc//config:platform -build:rbe-toolchain-gcc --crosstool_top=@rbe_ubuntu_gcc//cc:toolchain -build:rbe-toolchain-gcc --extra_toolchains=@rbe_ubuntu_gcc//config:cc-toolchain - -build:rbe-toolchain-msvc-cl --host_platform=@rbe_windows_msvc_cl//config:platform -build:rbe-toolchain-msvc-cl --platforms=@rbe_windows_msvc_cl//config:platform -build:rbe-toolchain-msvc-cl --crosstool_top=@rbe_windows_msvc_cl//cc:toolchain -build:rbe-toolchain-msvc-cl --extra_toolchains=@rbe_windows_msvc_cl//config:cc-toolchain - -build:rbe-toolchain-clang-cl --host_platform=@rbe_windows_clang_cl//config:platform -build:rbe-toolchain-clang-cl --platforms=@rbe_windows_clang_cl//config:platform -build:rbe-toolchain-clang-cl --crosstool_top=@rbe_windows_clang_cl//cc:toolchain -build:rbe-toolchain-clang-cl --extra_toolchains=@rbe_windows_clang_cl//config:cc-toolchain +build:rbe-toolchain-gcc --platforms=@envoy_build_tools//toolchains:rbe_linux_gcc_platform +build:rbe-toolchain-gcc --host_platform=@envoy_build_tools//toolchains:rbe_linux_gcc_platform +build:rbe-toolchain-gcc --crosstool_top=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_3.7.2/cc:toolchain +build:rbe-toolchain-gcc --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_3.7.2/config:cc-toolchain + +build:rbe-toolchain-msvc-cl --host_platform=envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform +build:rbe-toolchain-msvc-cl --platforms=envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform +build:rbe-toolchain-msvc-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_3.7.2/cc:toolchain +build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_3.7.2/config:cc-toolchain + +build:rbe-toolchain-clang-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform +build:rbe-toolchain-clang-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform +build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/cc:toolchain +build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:cc-toolchain build:remote --spawn_strategy=remote,sandboxed,local build:remote --strategy=Javac=remote,sandboxed,local diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index 7c806b08c98a6..3523df854809e 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -1,6 +1,5 @@ load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies") load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") -load("@envoy_build_tools//toolchains:rbe_toolchains_config.bzl", "rbe_toolchains_config") load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe_exec_properties_dict", "custom_exec_properties") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") @@ -17,7 +16,6 @@ def envoy_dependency_imports(go_version = GO_VERSION): rules_foreign_cc_dependencies() go_rules_dependencies() go_register_toolchains(go_version) - rbe_toolchains_config() gazelle_dependencies() apple_rules_dependencies() rust_repositories() diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c0d7057674533..ecc01abbf0247 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -65,11 +65,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "envoy-build-tools", project_desc = "Common build tools shared by the Envoy/UDPA ecosystem", project_url = "https://github.com/envoyproxy/envoy-build-tools", - version = "a955a00bed5f35777a83899ee680f8530eee4718", - sha256 = "b0830dc6fc1e3a095c5d817ca768c89c407bdd71894e1641daf500d28cb269da", + version = "58cdc97eb4623f53385ac5b6ca7e85d965724947", + sha256 = "21ba5ed3c4abf53be933ec615287b4b3fb0268fc598aa500b2b5729f77dbb2de", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2021-05-25", + release_date = "2021-08-14", use_category = ["build"], ), boringssl = dict( From 5ea3d939eab415808ee9fe414abb2ae4ccf4eeba Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Sun, 15 Aug 2021 02:10:35 +0000 Subject: [PATCH 2/9] Make dep checker happy Signed-off-by: Yan Avlasov --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index ecc01abbf0247..5ee14da2c1f39 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -69,7 +69,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "21ba5ed3c4abf53be933ec615287b4b3fb0268fc598aa500b2b5729f77dbb2de", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2021-08-14", + release_date = "2021-08-15", use_category = ["build"], ), boringssl = dict( From 339d8a742d0dae5b0daf76bdfa8702ce81c6abb5 Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Sun, 15 Aug 2021 02:51:09 +0000 Subject: [PATCH 3/9] Fix typos Signed-off-by: Yan Avlasov --- .bazelrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index 25800d5336f9e..8b3e2f35d6a06 100644 --- a/.bazelrc +++ b/.bazelrc @@ -205,8 +205,8 @@ build:rbe-toolchain-gcc --host_platform=@envoy_build_tools//toolchains:rbe_linux build:rbe-toolchain-gcc --crosstool_top=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_3.7.2/cc:toolchain build:rbe-toolchain-gcc --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_3.7.2/config:cc-toolchain -build:rbe-toolchain-msvc-cl --host_platform=envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform -build:rbe-toolchain-msvc-cl --platforms=envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform +build:rbe-toolchain-msvc-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform +build:rbe-toolchain-msvc-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform build:rbe-toolchain-msvc-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_3.7.2/cc:toolchain build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_3.7.2/config:cc-toolchain From 6498a965b1bb17d44606db2a9729da02a6878b59 Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Mon, 16 Aug 2021 18:20:32 +0000 Subject: [PATCH 4/9] Pin to bazel 4.1.0 Signed-off-by: Yan Avlasov --- .bazelrc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.bazelrc b/.bazelrc index 8b3e2f35d6a06..a62632931d7a3 100644 --- a/.bazelrc +++ b/.bazelrc @@ -167,15 +167,15 @@ build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 build:rbe-toolchain-clang --config=rbe-toolchain build:rbe-toolchain-clang --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_platform build:rbe-toolchain-clang --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_platform -build:rbe-toolchain-clang --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang/bazel_3.7.2/cc:toolchain -build:rbe-toolchain-clang --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang/bazel_3.7.2/config:cc-toolchain +build:rbe-toolchain-clang --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang/bazel_4.1.0/cc:toolchain +build:rbe-toolchain-clang --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang/bazel_4.1.0/config:cc-toolchain build:rbe-toolchain-clang --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin build:rbe-toolchain-clang-libc++ --config=rbe-toolchain build:rbe-toolchain-clang-libc++ --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform build:rbe-toolchain-clang-libc++ --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform -build:rbe-toolchain-clang-libc++ --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_3.7.2/cc:toolchain -build:rbe-toolchain-clang-libc++ --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_3.7.2/config:cc-toolchain +build:rbe-toolchain-clang-libc++ --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_4.1.0/cc:toolchain +build:rbe-toolchain-clang-libc++ --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_4.1.0/config:cc-toolchain build:rbe-toolchain-clang-libc++ --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin build:rbe-toolchain-clang-libc++ --action_env=CXXFLAGS=-stdlib=libc++ build:rbe-toolchain-clang-libc++ --action_env=LDFLAGS=-stdlib=libc++ @@ -202,18 +202,18 @@ build:rbe-toolchain-tsan --config=clang-tsan build:rbe-toolchain-gcc --config=rbe-toolchain build:rbe-toolchain-gcc --platforms=@envoy_build_tools//toolchains:rbe_linux_gcc_platform build:rbe-toolchain-gcc --host_platform=@envoy_build_tools//toolchains:rbe_linux_gcc_platform -build:rbe-toolchain-gcc --crosstool_top=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_3.7.2/cc:toolchain -build:rbe-toolchain-gcc --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_3.7.2/config:cc-toolchain +build:rbe-toolchain-gcc --crosstool_top=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_4.1.0/cc:toolchain +build:rbe-toolchain-gcc --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_4.1.0/config:cc-toolchain build:rbe-toolchain-msvc-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform build:rbe-toolchain-msvc-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform -build:rbe-toolchain-msvc-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_3.7.2/cc:toolchain -build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_3.7.2/config:cc-toolchain +build:rbe-toolchain-msvc-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_4.1.0/cc:toolchain +build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_4.1.0/config:cc-toolchain build:rbe-toolchain-clang-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform build:rbe-toolchain-clang-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform -build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/cc:toolchain -build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:cc-toolchain +build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_4.1.0/cc:toolchain +build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_4.1.0/config:cc-toolchain build:remote --spawn_strategy=remote,sandboxed,local build:remote --strategy=Javac=remote,sandboxed,local From 1b7666885c169d73d0c3b5c2333d2dff17628ab3 Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Sun, 22 Aug 2021 01:19:53 +0000 Subject: [PATCH 5/9] Ping windodws clang build to 3.7.2 directory Signed-off-by: Yan Avlasov --- .bazelrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index a62632931d7a3..ad0cb84a2773c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -212,8 +212,8 @@ build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/co build:rbe-toolchain-clang-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform build:rbe-toolchain-clang-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform -build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_4.1.0/cc:toolchain -build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_4.1.0/config:cc-toolchain +build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/cc:toolchain +build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:cc-toolchain build:remote --spawn_strategy=remote,sandboxed,local build:remote --strategy=Javac=remote,sandboxed,local From 1f4c93a4f71fc9ce2dbf3c7d54150722216e5710 Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Tue, 14 Sep 2021 02:36:44 +0000 Subject: [PATCH 6/9] Update to the single version toolchain Signed-off-by: Yan Avlasov --- .bazelrc | 20 ++++++++++---------- bazel/repository_locations.bzl | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.bazelrc b/.bazelrc index 9a9c21d67a808..da6747d187d70 100644 --- a/.bazelrc +++ b/.bazelrc @@ -169,15 +169,15 @@ build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 build:rbe-toolchain-clang --config=rbe-toolchain build:rbe-toolchain-clang --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_platform build:rbe-toolchain-clang --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_platform -build:rbe-toolchain-clang --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang/bazel_4.1.0/cc:toolchain -build:rbe-toolchain-clang --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang/bazel_4.1.0/config:cc-toolchain +build:rbe-toolchain-clang --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang/cc:toolchain +build:rbe-toolchain-clang --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang/config:cc-toolchain build:rbe-toolchain-clang --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin build:rbe-toolchain-clang-libc++ --config=rbe-toolchain build:rbe-toolchain-clang-libc++ --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform build:rbe-toolchain-clang-libc++ --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform -build:rbe-toolchain-clang-libc++ --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_4.1.0/cc:toolchain -build:rbe-toolchain-clang-libc++ --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/bazel_4.1.0/config:cc-toolchain +build:rbe-toolchain-clang-libc++ --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/cc:toolchain +build:rbe-toolchain-clang-libc++ --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/config:cc-toolchain build:rbe-toolchain-clang-libc++ --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin build:rbe-toolchain-clang-libc++ --action_env=CXXFLAGS=-stdlib=libc++ build:rbe-toolchain-clang-libc++ --action_env=LDFLAGS=-stdlib=libc++ @@ -204,18 +204,18 @@ build:rbe-toolchain-tsan --config=clang-tsan build:rbe-toolchain-gcc --config=rbe-toolchain build:rbe-toolchain-gcc --platforms=@envoy_build_tools//toolchains:rbe_linux_gcc_platform build:rbe-toolchain-gcc --host_platform=@envoy_build_tools//toolchains:rbe_linux_gcc_platform -build:rbe-toolchain-gcc --crosstool_top=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_4.1.0/cc:toolchain -build:rbe-toolchain-gcc --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/gcc/bazel_4.1.0/config:cc-toolchain +build:rbe-toolchain-gcc --crosstool_top=@envoy_build_tools//toolchains/configs/linux/gcc/cc:toolchain +build:rbe-toolchain-gcc --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/gcc/config:cc-toolchain build:rbe-toolchain-msvc-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform build:rbe-toolchain-msvc-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_msvc_cl_platform -build:rbe-toolchain-msvc-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_4.1.0/cc:toolchain -build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/msvc-cl/bazel_4.1.0/config:cc-toolchain +build:rbe-toolchain-msvc-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/msvc-cl/cc:toolchain +build:rbe-toolchain-msvc-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/msvc-cl/config:cc-toolchain build:rbe-toolchain-clang-cl --host_platform=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform build:rbe-toolchain-clang-cl --platforms=@envoy_build_tools//toolchains:rbe_windows_clang_cl_platform -build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/cc:toolchain -build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:cc-toolchain +build:rbe-toolchain-clang-cl --crosstool_top=@envoy_build_tools//toolchains/configs/windows/clang-cl/cc:toolchain +build:rbe-toolchain-clang-cl --extra_toolchains=@envoy_build_tools//toolchains/configs/windows/clang-cl/config:cc-toolchain build:remote --spawn_strategy=remote,sandboxed,local build:remote --strategy=Javac=remote,sandboxed,local diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 44e7dbaf7970b..c3f7bcd3bf789 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -65,11 +65,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "envoy-build-tools", project_desc = "Common build tools shared by the Envoy/UDPA ecosystem", project_url = "https://github.com/envoyproxy/envoy-build-tools", - version = "58cdc97eb4623f53385ac5b6ca7e85d965724947", - sha256 = "21ba5ed3c4abf53be933ec615287b4b3fb0268fc598aa500b2b5729f77dbb2de", + version = "b6bc66636f16870b8390b400c2d2bc0160c71f73", + sha256 = "5cbc48f34c3b5fdbce21a582defa7bbc5c77bf11c5b7b8991ad1d0e3eb87e19d", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2021-08-15", + release_date = "2021-09-13", use_category = ["build"], ), boringssl = dict( From df875c977ed52e7e676572828ea4afe623fbbd4b Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Tue, 14 Sep 2021 03:52:46 +0000 Subject: [PATCH 7/9] Fix date Signed-off-by: Yan Avlasov --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c3f7bcd3bf789..9d5674d91b050 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -69,7 +69,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "5cbc48f34c3b5fdbce21a582defa7bbc5c77bf11c5b7b8991ad1d0e3eb87e19d", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2021-09-13", + release_date = "2021-09-14", use_category = ["build"], ), boringssl = dict( From 7c1f430b04bf2dabd8fc61c0e21b2ca0590f4bda Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Sat, 18 Sep 2021 00:05:02 +0000 Subject: [PATCH 8/9] Bump to clang v12.0.1 build images Signed-off-by: Yan Avlasov --- bazel/repository_locations.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 9d5674d91b050..b2fa0b3feea32 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -65,11 +65,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "envoy-build-tools", project_desc = "Common build tools shared by the Envoy/UDPA ecosystem", project_url = "https://github.com/envoyproxy/envoy-build-tools", - version = "b6bc66636f16870b8390b400c2d2bc0160c71f73", - sha256 = "5cbc48f34c3b5fdbce21a582defa7bbc5c77bf11c5b7b8991ad1d0e3eb87e19d", + version = "a9db6cde8e8d4404621e9631bba237c45e04ceed", + sha256 = "f2c7d4d5c4b18d85321d4c43686b8c5b5473a4ad9b1f8f4245d863a10367a9c0", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2021-09-14", + release_date = "2021-09-18", use_category = ["build"], ), boringssl = dict( From f692115828e51efa5ee03fc569a26a792045a3b5 Mon Sep 17 00:00:00 2001 From: Yan Avlasov Date: Sat, 18 Sep 2021 00:18:07 +0000 Subject: [PATCH 9/9] Fix date Signed-off-by: Yan Avlasov --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index b2fa0b3feea32..8166a907a657e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -69,7 +69,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "f2c7d4d5c4b18d85321d4c43686b8c5b5473a4ad9b1f8f4245d863a10367a9c0", strip_prefix = "envoy-build-tools-{version}", urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"], - release_date = "2021-09-18", + release_date = "2021-09-17", use_category = ["build"], ), boringssl = dict(