Bazel 7.0.0 (#13321)

This commit is contained in:
Preston Van Loon 2024-01-10 09:34:11 -06:00 committed by GitHub
parent 283e09569d
commit 3a2b486bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1264 additions and 16 deletions

View File

@ -1 +1 @@
6.4.0 7.0.0

View File

@ -10,7 +10,7 @@
# Prysm specific remote-cache properties. # Prysm specific remote-cache properties.
build:remote-cache --remote_download_minimal build:remote-cache --remote_download_minimal
build:remote-cache --experimental_remote_build_event_upload=minimal build:remote-cache --remote_build_event_upload=minimal
build:remote-cache --remote_cache=grpc://bazel-remote-cache:9092 build:remote-cache --remote_cache=grpc://bazel-remote-cache:9092
# Does not work with rules_oci. See https://github.com/bazel-contrib/rules_oci/issues/292 # Does not work with rules_oci. See https://github.com/bazel-contrib/rules_oci/issues/292
#build:remote-cache --experimental_remote_downloader=grpc://bazel-remote-cache:9092 #build:remote-cache --experimental_remote_downloader=grpc://bazel-remote-cache:9092

6
MODULE.bazel Normal file
View File

@ -0,0 +1,6 @@
###############################################################################
# Bazel now uses Bzlmod by default to manage external dependencies.
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
#
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################

1245
MODULE.bazel.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -356,10 +356,10 @@ filegroup(
http_archive( http_archive(
name = "com_google_protobuf", name = "com_google_protobuf",
sha256 = "4e176116949be52b0408dfd24f8925d1eb674a781ae242a75296b17a1c721395", sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
strip_prefix = "protobuf-23.3", strip_prefix = "protobuf-25.1",
urls = [ urls = [
"https://github.com/protocolbuffers/protobuf/archive/v23.3.tar.gz", "https://github.com/protocolbuffers/protobuf/archive/v25.1.tar.gz",
], ],
) )

View File

@ -2990,8 +2990,8 @@ def prysm_deps():
go_repository( go_repository(
name = "com_github_multiformats_go_multiaddr", name = "com_github_multiformats_go_multiaddr",
importpath = "github.com/multiformats/go-multiaddr", importpath = "github.com/multiformats/go-multiaddr",
sum = "h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE=", sum = "h1:vm+BA/WZA8QZDp1pF1FWhi5CT3g1tbi5GJmqpb6wnlk=",
version = "v0.12.0", version = "v0.12.1",
) )
go_repository( go_repository(
name = "com_github_multiformats_go_multiaddr_dns", name = "com_github_multiformats_go_multiaddr_dns",

2
go.mod
View File

@ -53,7 +53,7 @@ require (
github.com/minio/highwayhash v1.0.2 github.com/minio/highwayhash v1.0.2
github.com/minio/sha256-simd v1.0.1 github.com/minio/sha256-simd v1.0.1
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/multiformats/go-multiaddr v0.12.0 github.com/multiformats/go-multiaddr v0.12.1
github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.10 github.com/onsi/gomega v1.27.10
github.com/patrickmn/go-cache v2.1.0+incompatible github.com/patrickmn/go-cache v2.1.0+incompatible

4
go.sum
View File

@ -922,8 +922,8 @@ github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9
github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo= github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
github.com/multiformats/go-multiaddr v0.12.0 h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE= github.com/multiformats/go-multiaddr v0.12.1 h1:vm+BA/WZA8QZDp1pF1FWhi5CT3g1tbi5GJmqpb6wnlk=
github.com/multiformats/go-multiaddr v0.12.0/go.mod h1:WmZXgObOQOYp9r3cslLlppkrz1FYSHmE834dfz/lWu8= github.com/multiformats/go-multiaddr v0.12.1/go.mod h1:7mPkiBMmLeFipt+nNSq9pHZUeJSt8lHBgH6yhj0YQzE=
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A= github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk= github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E= github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

View File

@ -8,13 +8,13 @@ def _go_test_transition_impl(settings, attr):
if attr.eth_network == "minimal": if attr.eth_network == "minimal":
settings["//proto:network"] = "minimal" settings["//proto:network"] = "minimal"
settings["@io_bazel_rules_go//go/config:tags"] += ["minimal"] settings["@io_bazel_rules_go//go/config:tags"] = ["minimal"] + settings["@io_bazel_rules_go//go/config:tags"]
elif attr.eth_network == "mainnet": # Default / optional elif attr.eth_network == "mainnet": # Default / optional
settings["//proto:network"] = "mainnet" settings["//proto:network"] = "mainnet"
settings["@io_bazel_rules_go//go/config:tags"] += ["mainnet"] settings["@io_bazel_rules_go//go/config:tags"] = ["mainnet"] + settings["@io_bazel_rules_go//go/config:tags"]
if attr.gotags: if attr.gotags:
settings["@io_bazel_rules_go//go/config:tags"] += attr.gotags settings["@io_bazel_rules_go//go/config:tags"] = attr.gotags + settings["@io_bazel_rules_go//go/config:tags"]
if str(settings["//command_line_option:compilation_mode"]) == "dbg": if str(settings["//command_line_option:compilation_mode"]) == "dbg":
settings["@io_bazel_rules_go//go/config:debug"] = True settings["@io_bazel_rules_go//go/config:debug"] = True
@ -42,9 +42,6 @@ def _go_test_transition_rule(**kwargs):
attrs = dict(kwargs["attrs"]) attrs = dict(kwargs["attrs"])
attrs.update({ attrs.update({
"eth_network": attr.string(values = ["mainnet", "minimal"]), "eth_network": attr.string(values = ["mainnet", "minimal"]),
"_whitelist_function_transition": attr.label(
default = "@bazel_tools//tools/whitelists/function_transition_whitelist",
),
}) })
kwargs["attrs"] = attrs kwargs["attrs"] = attrs
kwargs["cfg"] = go_test_transition kwargs["cfg"] = go_test_transition