Update bazel to 5.0.0 (prysmaticlabs#10352)

* Update to bazel 5 * Add new bazel 5 experimental flags to improve remote caching * regen cross compile for bazel 5 * gazelle * remove some old flags * use heremtic builds sandbox * minimal downloads for better disk usage * Restore manual tags for darwin builds
moshe-blox · Mar 14, 2022 · aa86c94 · aa86c94
1 parent 75bb25d
commit aa86c94
Show file tree

Hide file tree

Showing 20 changed files with 243 additions and 35 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-4.2.2
+5.0.0
diff --git a/.buildkite-bazelrc b/.buildkite-bazelrc
@@ -10,26 +10,26 @@
 
 # Prysm specific remote-cache properties.
 #build:remote-cache --disk_cache=
-build:remote-cache --remote_download_toplevel
+build:remote-cache --remote_download_minimal
 build:remote-cache --remote_cache=grpc://bazel-remote-cache:9092
 build:remote-cache --experimental_remote_downloader=grpc://bazel-remote-cache:9092
 build:remote-cache --remote_local_fallback
+build:remote-cache --experimental_remote_cache_async
+build:remote-cache --experimental_remote_merkle_tree_cache
+build:remote-cache --experimental_action_cache_store_output_metadata
+build:remote-cache --experimental_remote_cache_compression
 # Enforce stricter environment rules, which eliminates some non-hermetic
 # behavior and therefore improves both the remote cache hit rate and the
 # correctness and repeatability of the build.
 build:remote-cache --incompatible_strict_action_env=true
 
+build --experimental_use_hermetic_linux_sandbox
+
 # Import workspace options.
 import %workspace%/.bazelrc
 
 startup --host_jvm_args=-Xmx2g --host_jvm_args=-Xms2g
-query --repository_cache=/tmp/repositorycache
-query --experimental_repository_cache_hardlinks
-build --repository_cache=/tmp/repositorycache
-build --experimental_repository_cache_hardlinks
 build --experimental_strict_action_env
-build --disk_cache=/tmp/bazelbuilds
-build --experimental_multi_threaded_digest
 build --sandbox_tmpfs_path=/tmp
 build --verbose_failures
 build --announce_rc

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -3,7 +3,7 @@ load("@com_github_atlassian_bazel_tools//gometalinter:def.bzl", "gometalinter")
 load("@com_github_atlassian_bazel_tools//goimports:def.bzl", "goimports")
 load("@io_kubernetes_build//defs:run_in_workspace.bzl", "workspace_binary")
 load("@io_bazel_rules_go//go:def.bzl", "nogo")
-load("@graknlabs_bazel_distribution//common:rules.bzl", "assemble_targz", "assemble_versioned")
+load("@vaticle_bazel_distribution//common:rules.bzl", "assemble_targz", "assemble_versioned")
 load("@bazel_skylib//rules:common_settings.bzl", "string_setting")
 
 prefix = "github.com/prysmaticlabs/prysm"

diff --git a/WORKSPACE b/WORKSPACE
@@ -117,13 +117,6 @@ http_archive(
     urls = ["https://github.com/fuzzitdev/fuzzit/releases/download/v2.4.76/fuzzit_Linux_x86_64.zip"],
 )
 
-git_repository(
-    name = "graknlabs_bazel_distribution",
-    commit = "962f3a7e56942430c0ec120c24f9e9f2a9c2ce1a",
-    remote = "https://github.com/graknlabs/bazel-distribution",
-    shallow_since = "1569509514 +0300",
-)
-
 load(
     "@io_bazel_rules_docker//repositories:repositories.bzl",
     container_repositories = "repositories",

diff --git a/deps.bzl b/deps.bzl
@@ -3867,9 +3867,9 @@ def prysm_deps():
     # Note: go_repository is already wrapped with maybe!
     maybe(
         git_repository,
-        name = "graknlabs_bazel_distribution",
-        commit = "962f3a7e56942430c0ec120c24f9e9f2a9c2ce1a",
-        remote = "https://github.com/graknlabs/bazel-distribution",
+        name = "vaticle_bazel_distribution",
+        commit = "96424c85195a97dad81f69fdbbef2e1574bf8801",
+        remote = "https://github.com/vaticle/bazel-distribution",
         shallow_since = "1569509514 +0300",
     )
 

diff --git a/tools/cross-toolchain/configs/.latest.bazelrc b/tools/cross-toolchain/configs/.latest.bazelrc
@@ -19,13 +19,13 @@
 # Specifically, it includes all toolchain/platform flags
 # This file is used for testing purposes.
 
-build:remote --host_javabase=//tools/cross-toolchain/configs/clang/bazel_4.2.1/java:jdk
-build:remote --javabase=//tools/cross-toolchain/configs/clang/bazel_4.2.1/java:jdk
-build:remote --crosstool_top=//tools/cross-toolchain/configs/clang/bazel_4.2.1/cc:toolchain
-build:remote --extra_toolchains=//tools/cross-toolchain/configs/clang/bazel_4.2.1/config:cc-toolchain
-build:remote --extra_execution_platforms=//tools/cross-toolchain/configs/clang/bazel_4.2.1/config:platform
-build:remote --host_platform=//tools/cross-toolchain/configs/clang/bazel_4.2.1/config:platform
-build:remote --platforms=//tools/cross-toolchain/configs/clang/bazel_4.2.1/config:platform
+build:remote --host_javabase=//tools/cross-toolchain/configs/clang/bazel_5.0.0/java:jdk
+build:remote --javabase=//tools/cross-toolchain/configs/clang/bazel_5.0.0/java:jdk
+build:remote --crosstool_top=//tools/cross-toolchain/configs/clang/bazel_5.0.0/cc:toolchain
+build:remote --extra_toolchains=//tools/cross-toolchain/configs/clang/bazel_5.0.0/config:cc-toolchain
+build:remote --extra_execution_platforms=//tools/cross-toolchain/configs/clang/bazel_5.0.0/config:platform
+build:remote --host_platform=//tools/cross-toolchain/configs/clang/bazel_5.0.0/config:platform
+build:remote --platforms=//tools/cross-toolchain/configs/clang/bazel_5.0.0/config:platform
 
 # Import the default bazelrc file in bazel-toolchains repo.
 # This will only work for tests executed from bazel-toolchains

diff --git a/...lchain/configs/clang/bazel_4.2.1/cc/BUILD → ...lchain/configs/clang/bazel_5.0.0/cc/BUILD b/...lchain/configs/clang/bazel_4.2.1/cc/BUILD → ...lchain/configs/clang/bazel_5.0.0/cc/BUILD
@@ -14,12 +14,12 @@
 
 # This becomes the BUILD file for @local_config_cc// under non-BSD unixes.
 
-package(default_visibility = ["//visibility:public"])
-
 load(":cc_toolchain_config.bzl", "cc_toolchain_config")
 load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
 load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
 
+package(default_visibility = ["//visibility:public"])
+
 licenses(["notice"])  # Apache 2.0
 
 cc_library(
@@ -108,12 +108,13 @@ cc_toolchain_config(
         "/usr/include/c++/8",
         "/usr/include/x86_64-linux-gnu/c++/8",
         "/usr/include/c++/8/backward",
+        "/usr/include/c++/v1",
     ],
     cxx_flags = ["-std=c++0x"],
     dbg_compile_flags = ["-g"],
     host_system_name = "local",
     link_flags = [
-        "-fuse-ld=/usr/bin/ld.gold",
+        "-fuse-ld=/usr/bin/ld.lld",
         "-Wl,-no-as-needed",
         "-Wl,-z,relro,-z,now",
         "-B/usr/bin",
@@ -139,7 +140,7 @@ cc_toolchain_config(
         "ld": "/usr/bin/ld",
         "llvm-cov": "/usr/bin/llvm-cov",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/usr/bin/clang",
+        "gcc": "/usr/bin/clang-10",
         "dwp": "/usr/bin/dwp",
         "gcov": "/usr/bin/llvm-profdata",
         "nm": "/usr/bin/nm",

diff --git a/..._4.2.1/cc/armeabi_cc_toolchain_config.bzl → ..._5.0.0/cc/armeabi_cc_toolchain_config.bzl b/..._4.2.1/cc/armeabi_cc_toolchain_config.bzl → ..._5.0.0/cc/armeabi_cc_toolchain_config.bzl
diff --git a/..._4.2.1/cc/builtin_include_directory_paths → ..._5.0.0/cc/builtin_include_directory_paths b/..._4.2.1/cc/builtin_include_directory_paths → ..._5.0.0/cc/builtin_include_directory_paths
@@ -1,5 +1,5 @@
 This file is generated by cc_configure and contains builtin include directories
-that /usr/bin/clang reported. This file is a dependency of every compilation action and
+that /usr/bin/clang-10 reported. This file is a dependency of every compilation action and
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
@@ -12,3 +12,4 @@ declared action inputs or the action commandline changes.
 /usr/include/c++/8
 /usr/include/x86_64-linux-gnu/c++/8
 /usr/include/c++/8/backward
+/usr/include/c++/v1
diff --git a/...ng/bazel_4.2.1/cc/cc_toolchain_config.bzl → ...ng/bazel_5.0.0/cc/cc_toolchain_config.bzl b/...ng/bazel_4.2.1/cc/cc_toolchain_config.bzl → ...ng/bazel_5.0.0/cc/cc_toolchain_config.bzl
@@ -386,7 +386,7 @@ def _impl(ctx):
                 ],
                 flag_groups = [
                     flag_group(
-                        flags = ["-gsplit-dwarf"],
+                        flags = ["-gsplit-dwarf", "-g"],
                         expand_if_available = "per_object_debug_info_file",
                     ),
                 ],
@@ -669,6 +669,32 @@ def _impl(ctx):
         ],
     )
 
+    external_include_paths_feature = feature(
+        name = "external_include_paths",
+        flag_sets = [
+            flag_set(
+                actions = [
+                    ACTION_NAMES.preprocess_assemble,
+                    ACTION_NAMES.linkstamp_compile,
+                    ACTION_NAMES.c_compile,
+                    ACTION_NAMES.cpp_compile,
+                    ACTION_NAMES.cpp_header_parsing,
+                    ACTION_NAMES.cpp_module_compile,
+                    ACTION_NAMES.clif_match,
+                    ACTION_NAMES.objc_compile,
+                    ACTION_NAMES.objcpp_compile,
+                ],
+                flag_groups = [
+                    flag_group(
+                        flags = ["-isystem", "%{external_include_paths}"],
+                        iterate_over = "external_include_paths",
+                        expand_if_available = "external_include_paths",
+                    ),
+                ],
+            ),
+        ],
+    )
+
     symbol_counts_feature = feature(
         name = "symbol_counts",
         flag_sets = [
@@ -1167,6 +1193,7 @@ def _impl(ctx):
             preprocessor_defines_feature,
             includes_feature,
             include_paths_feature,
+            external_include_paths_feature,
             fdo_instrument_feature,
             cs_fdo_instrument_feature,
             cs_fdo_optimize_feature,
@@ -1216,6 +1243,7 @@ def _impl(ctx):
             coverage_feature,
             default_compile_flags_feature,
             default_link_flags_feature,
+            user_link_flags_feature,
             fdo_optimize_feature,
             supports_dynamic_linker_feature,
             dbg_feature,

diff --git a/...onfigs/clang/bazel_4.2.1/cc/cc_wrapper.sh → ...onfigs/clang/bazel_5.0.0/cc/cc_wrapper.sh b/...onfigs/clang/bazel_4.2.1/cc/cc_wrapper.sh → ...onfigs/clang/bazel_5.0.0/cc/cc_wrapper.sh
@@ -22,4 +22,4 @@ set -eu
 
 
 # Call the C++ compiler
-/usr/bin/clang "$@"
+/usr/bin/clang-10 "$@"
diff --git a/...igs/clang/bazel_4.2.1/cc/module.modulemap → ...igs/clang/bazel_5.0.0/cc/module.modulemap b/...igs/clang/bazel_4.2.1/cc/module.modulemap → ...igs/clang/bazel_5.0.0/cc/module.modulemap
@@ -6106,4 +6106,179 @@ module "crosstool" [system] {
   textual header "/usr/include/c++/8/backward/hash_set"
   textual header "/usr/include/c++/8/backward/hashtable.h"
   textual header "/usr/include/c++/8/backward/strstream"
+  textual header "/usr/include/c++/v1/__bit_reference"
+  textual header "/usr/include/c++/v1/__bsd_locale_defaults.h"
+  textual header "/usr/include/c++/v1/__bsd_locale_fallbacks.h"
+  textual header "/usr/include/c++/v1/__config"
+  textual header "/usr/include/c++/v1/__cxxabi_config.h"
+  textual header "/usr/include/c++/v1/__debug"
+  textual header "/usr/include/c++/v1/__errc"
+  textual header "/usr/include/c++/v1/__functional_03"
+  textual header "/usr/include/c++/v1/__functional_base"
+  textual header "/usr/include/c++/v1/__functional_base_03"
+  textual header "/usr/include/c++/v1/__hash_table"
+  textual header "/usr/include/c++/v1/__libcpp_version"
+  textual header "/usr/include/c++/v1/__locale"
+  textual header "/usr/include/c++/v1/__mutex_base"
+  textual header "/usr/include/c++/v1/__node_handle"
+  textual header "/usr/include/c++/v1/__nullptr"
+  textual header "/usr/include/c++/v1/__split_buffer"
+  textual header "/usr/include/c++/v1/__sso_allocator"
+  textual header "/usr/include/c++/v1/__std_stream"
+  textual header "/usr/include/c++/v1/__string"
+  textual header "/usr/include/c++/v1/__threading_support"
+  textual header "/usr/include/c++/v1/__tree"
+  textual header "/usr/include/c++/v1/__tuple"
+  textual header "/usr/include/c++/v1/__undef_macros"
+  textual header "/usr/include/c++/v1/algorithm"
+  textual header "/usr/include/c++/v1/any"
+  textual header "/usr/include/c++/v1/array"
+  textual header "/usr/include/c++/v1/atomic"
+  textual header "/usr/include/c++/v1/bit"
+  textual header "/usr/include/c++/v1/bitset"
+  textual header "/usr/include/c++/v1/cassert"
+  textual header "/usr/include/c++/v1/ccomplex"
+  textual header "/usr/include/c++/v1/cctype"
+  textual header "/usr/include/c++/v1/cerrno"
+  textual header "/usr/include/c++/v1/cfenv"
+  textual header "/usr/include/c++/v1/cfloat"
+  textual header "/usr/include/c++/v1/charconv"
+  textual header "/usr/include/c++/v1/chrono"
+  textual header "/usr/include/c++/v1/cinttypes"
+  textual header "/usr/include/c++/v1/ciso646"
+  textual header "/usr/include/c++/v1/climits"
+  textual header "/usr/include/c++/v1/clocale"
+  textual header "/usr/include/c++/v1/cmath"
+  textual header "/usr/include/c++/v1/codecvt"
+  textual header "/usr/include/c++/v1/compare"
+  textual header "/usr/include/c++/v1/complex"
+  textual header "/usr/include/c++/v1/complex.h"
+  textual header "/usr/include/c++/v1/condition_variable"
+  textual header "/usr/include/c++/v1/csetjmp"
+  textual header "/usr/include/c++/v1/csignal"
+  textual header "/usr/include/c++/v1/cstdarg"
+  textual header "/usr/include/c++/v1/cstdbool"
+  textual header "/usr/include/c++/v1/cstddef"
+  textual header "/usr/include/c++/v1/cstdint"
+  textual header "/usr/include/c++/v1/cstdio"
+  textual header "/usr/include/c++/v1/cstdlib"
+  textual header "/usr/include/c++/v1/cstring"
+  textual header "/usr/include/c++/v1/ctgmath"
+  textual header "/usr/include/c++/v1/ctime"
+  textual header "/usr/include/c++/v1/ctype.h"
+  textual header "/usr/include/c++/v1/cwchar"
+  textual header "/usr/include/c++/v1/cwctype"
+  textual header "/usr/include/c++/v1/cxxabi.h"
+  textual header "/usr/include/c++/v1/deque"
+  textual header "/usr/include/c++/v1/errno.h"
+  textual header "/usr/include/c++/v1/exception"
+  textual header "/usr/include/c++/v1/execution"
+  textual header "/usr/include/c++/v1/experimental/__config"
+  textual header "/usr/include/c++/v1/experimental/__memory"
+  textual header "/usr/include/c++/v1/experimental/algorithm"
+  textual header "/usr/include/c++/v1/experimental/coroutine"
+  textual header "/usr/include/c++/v1/experimental/deque"
+  textual header "/usr/include/c++/v1/experimental/filesystem"
+  textual header "/usr/include/c++/v1/experimental/forward_list"
+  textual header "/usr/include/c++/v1/experimental/functional"
+  textual header "/usr/include/c++/v1/experimental/iterator"
+  textual header "/usr/include/c++/v1/experimental/list"
+  textual header "/usr/include/c++/v1/experimental/map"
+  textual header "/usr/include/c++/v1/experimental/memory_resource"
+  textual header "/usr/include/c++/v1/experimental/propagate_const"
+  textual header "/usr/include/c++/v1/experimental/regex"
+  textual header "/usr/include/c++/v1/experimental/set"
+  textual header "/usr/include/c++/v1/experimental/simd"
+  textual header "/usr/include/c++/v1/experimental/string"
+  textual header "/usr/include/c++/v1/experimental/type_traits"
+  textual header "/usr/include/c++/v1/experimental/unordered_map"
+  textual header "/usr/include/c++/v1/experimental/unordered_set"
+  textual header "/usr/include/c++/v1/experimental/utility"
+  textual header "/usr/include/c++/v1/experimental/vector"
+  textual header "/usr/include/c++/v1/ext/__hash"
+  textual header "/usr/include/c++/v1/ext/hash_map"
+  textual header "/usr/include/c++/v1/ext/hash_set"
+  textual header "/usr/include/c++/v1/fenv.h"
+  textual header "/usr/include/c++/v1/filesystem"
+  textual header "/usr/include/c++/v1/float.h"
+  textual header "/usr/include/c++/v1/forward_list"
+  textual header "/usr/include/c++/v1/fstream"
+  textual header "/usr/include/c++/v1/functional"
+  textual header "/usr/include/c++/v1/future"
+  textual header "/usr/include/c++/v1/initializer_list"
+  textual header "/usr/include/c++/v1/inttypes.h"
+  textual header "/usr/include/c++/v1/iomanip"
+  textual header "/usr/include/c++/v1/ios"
+  textual header "/usr/include/c++/v1/iosfwd"
+  textual header "/usr/include/c++/v1/iostream"
+  textual header "/usr/include/c++/v1/istream"
+  textual header "/usr/include/c++/v1/iterator"
+  textual header "/usr/include/c++/v1/limits"
+  textual header "/usr/include/c++/v1/limits.h"
+  textual header "/usr/include/c++/v1/list"
+  textual header "/usr/include/c++/v1/locale"
+  textual header "/usr/include/c++/v1/locale.h"
+  textual header "/usr/include/c++/v1/map"
+  textual header "/usr/include/c++/v1/math.h"
+  textual header "/usr/include/c++/v1/memory"
+  textual header "/usr/include/c++/v1/module.modulemap"
+  textual header "/usr/include/c++/v1/mutex"
+  textual header "/usr/include/c++/v1/new"
+  textual header "/usr/include/c++/v1/numeric"
+  textual header "/usr/include/c++/v1/optional"
+  textual header "/usr/include/c++/v1/ostream"
+  textual header "/usr/include/c++/v1/queue"
+  textual header "/usr/include/c++/v1/random"
+  textual header "/usr/include/c++/v1/ratio"
+  textual header "/usr/include/c++/v1/regex"
+  textual header "/usr/include/c++/v1/scoped_allocator"
+  textual header "/usr/include/c++/v1/set"
+  textual header "/usr/include/c++/v1/setjmp.h"
+  textual header "/usr/include/c++/v1/shared_mutex"
+  textual header "/usr/include/c++/v1/span"
+  textual header "/usr/include/c++/v1/sstream"
+  textual header "/usr/include/c++/v1/stack"
+  textual header "/usr/include/c++/v1/stdbool.h"
+  textual header "/usr/include/c++/v1/stddef.h"
+  textual header "/usr/include/c++/v1/stdexcept"
+  textual header "/usr/include/c++/v1/stdint.h"
+  textual header "/usr/include/c++/v1/stdio.h"
+  textual header "/usr/include/c++/v1/stdlib.h"
+  textual header "/usr/include/c++/v1/streambuf"
+  textual header "/usr/include/c++/v1/string"
+  textual header "/usr/include/c++/v1/string.h"
+  textual header "/usr/include/c++/v1/string_view"
+  textual header "/usr/include/c++/v1/strstream"
+  textual header "/usr/include/c++/v1/support/android/locale_bionic.h"
+  textual header "/usr/include/c++/v1/support/fuchsia/xlocale.h"
+  textual header "/usr/include/c++/v1/support/ibm/limits.h"
+  textual header "/usr/include/c++/v1/support/ibm/locale_mgmt_aix.h"
+  textual header "/usr/include/c++/v1/support/ibm/support.h"
+  textual header "/usr/include/c++/v1/support/ibm/xlocale.h"
+  textual header "/usr/include/c++/v1/support/musl/xlocale.h"
+  textual header "/usr/include/c++/v1/support/newlib/xlocale.h"
+  textual header "/usr/include/c++/v1/support/solaris/floatingpoint.h"
+  textual header "/usr/include/c++/v1/support/solaris/wchar.h"
+  textual header "/usr/include/c++/v1/support/solaris/xlocale.h"
+  textual header "/usr/include/c++/v1/support/win32/limits_msvc_win32.h"
+  textual header "/usr/include/c++/v1/support/win32/locale_win32.h"
+  textual header "/usr/include/c++/v1/support/xlocale/__nop_locale_mgmt.h"
+  textual header "/usr/include/c++/v1/support/xlocale/__posix_l_fallback.h"
+  textual header "/usr/include/c++/v1/support/xlocale/__strtonum_fallback.h"
+  textual header "/usr/include/c++/v1/system_error"
+  textual header "/usr/include/c++/v1/tgmath.h"
+  textual header "/usr/include/c++/v1/thread"
+  textual header "/usr/include/c++/v1/tuple"
+  textual header "/usr/include/c++/v1/type_traits"
+  textual header "/usr/include/c++/v1/typeindex"
+  textual header "/usr/include/c++/v1/typeinfo"
+  textual header "/usr/include/c++/v1/unordered_map"
+  textual header "/usr/include/c++/v1/unordered_set"
+  textual header "/usr/include/c++/v1/utility"
+  textual header "/usr/include/c++/v1/valarray"
+  textual header "/usr/include/c++/v1/variant"
+  textual header "/usr/include/c++/v1/vector"
+  textual header "/usr/include/c++/v1/version"
+  textual header "/usr/include/c++/v1/wchar.h"
+  textual header "/usr/include/c++/v1/wctype.h"
 }
diff --git a/...in/configs/clang/bazel_4.2.1/config/BUILD → ...in/configs/clang/bazel_5.0.0/config/BUILD b/...in/configs/clang/bazel_4.2.1/config/BUILD → ...in/configs/clang/bazel_5.0.0/config/BUILD
@@ -29,7 +29,7 @@ toolchain(
         "@bazel_tools//platforms:linux",
         "@bazel_tools//platforms:x86_64",
     ],
-    toolchain = "//tools/cross-toolchain/configs/clang/bazel_4.2.1/cc:cc-compiler-k8",
+    toolchain = "//tools/cross-toolchain/configs/clang/bazel_5.0.0/cc:cc-compiler-k8",
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
 

diff --git a/...hain/configs/clang/bazel_4.2.1/java/BUILD → ...hain/configs/clang/bazel_5.0.0/java/BUILD b/...hain/configs/clang/bazel_4.2.1/java/BUILD → ...hain/configs/clang/bazel_5.0.0/java/BUILD
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ set -eu


		# Call the C++ compiler
		/usr/bin/clang "$@"
		/usr/bin/clang-10 "$@"