diff --git a/cmd/beacon-chain/BUILD.bazel b/cmd/beacon-chain/BUILD.bazel index aa973fdf46aa..63fdc2c675ba 100644 --- a/cmd/beacon-chain/BUILD.bazel +++ b/cmd/beacon-chain/BUILD.bazel @@ -137,4 +137,5 @@ prysm_image_upload( # Backwards compatiability for images that depended on the old filepath. "/app/cmd/beacon-chain/beacon-chain": "/beacon-chain", }, + tags = ["manual"], ) diff --git a/cmd/prysmctl/BUILD.bazel b/cmd/prysmctl/BUILD.bazel index f84ecc09b422..032224910c28 100644 --- a/cmd/prysmctl/BUILD.bazel +++ b/cmd/prysmctl/BUILD.bazel @@ -99,4 +99,5 @@ prysm_image_upload( # Backwards compatiability for images that depended on the old filepath. "/app/cmd/prysmctl/prysmctl": "/prysmctl", }, + tags = ["manual"], ) diff --git a/cmd/validator/BUILD.bazel b/cmd/validator/BUILD.bazel index 2e7b9b3824a3..46ca1e241e2e 100644 --- a/cmd/validator/BUILD.bazel +++ b/cmd/validator/BUILD.bazel @@ -132,4 +132,5 @@ prysm_image_upload( # Backwards compatiability for images that depended on the old filepath. "/app/cmd/validator/validator": "/validator", }, + tags = ["manual"], ) diff --git a/tools/beacon-fuzz/BUILD.bazel b/tools/beacon-fuzz/BUILD.bazel index 612d3d03b7da..eadd1b84d0e6 100644 --- a/tools/beacon-fuzz/BUILD.bazel +++ b/tools/beacon-fuzz/BUILD.bazel @@ -5,11 +5,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( name = "go_default_library", srcs = ["main.go"], + importpath = "github.com/prysmaticlabs/prysm/v4/tools/beacon-fuzz", + visibility = ["//visibility:private"], deps = [ "//io/file:go_default_library", ], - importpath = "github.com/prysmaticlabs/prysm/v4/tools/beacon-fuzz", - visibility = ["//visibility:private"], ) go_binary( diff --git a/tools/cross-toolchain/darwin_cc_hack.bzl b/tools/cross-toolchain/darwin_cc_hack.bzl index 5c8e9ed9d641..6a3a9de870c1 100644 --- a/tools/cross-toolchain/darwin_cc_hack.bzl +++ b/tools/cross-toolchain/darwin_cc_hack.bzl @@ -34,7 +34,6 @@ def cc_autoconf_toolchains_impl(repository_ctx): else: repository_ctx.file("BUILD", "# C++ toolchain autoconfiguration was disabled by BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN env variable.") - def cc_autoconf_impl(repository_ctx, overriden_tools = dict()): """Generate BUILD file with 'cc_toolchain' targets for the local host C++ toolchain. @@ -45,10 +44,10 @@ def cc_autoconf_impl(repository_ctx, overriden_tools = dict()): cpu_value = get_cpu_value(repository_ctx) if cpu_value.startswith("darwin"): - print("Configuring local C++ toolchain for Darwin. This is non-hermetic and builds may " + - "not be reproducible. Consider building on linux for a hermetic build.") + print("Configuring local C++ toolchain for Darwin. This is non-hermetic and builds may " + + "not be reproducible. Consider building on linux for a hermetic build.") configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools) - else: + else: paths = resolve_labels(repository_ctx, [ "@bazel_tools//tools/cpp:BUILD.empty.tpl", "@bazel_tools//tools/cpp:empty_cc_toolchain_config.bzl", @@ -111,4 +110,4 @@ def configure_nonhermetic_darwin(): native.register_toolchains( # Use register_toolchain's target pattern expansion to register all toolchains in the package. "@local_config_cc_toolchains//:all", - ) \ No newline at end of file + ) diff --git a/tools/image_deps.bzl b/tools/image_deps.bzl index bdc415792171..7cd16d61a08b 100644 --- a/tools/image_deps.bzl +++ b/tools/image_deps.bzl @@ -1,48 +1,46 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") def prysm_image_deps(): - http_file( - name = "bash_amd64", - sha256 = "f702ef058e762d7208a9c83f6f6bbf02645533bfd615c54e8cdcce842cd57377", - urls = [ - "http://ftp.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", - "http://http.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", - "http://ftp.uk.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", - "http://ftp.au.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", - ], - ) - - http_file( - name = "bash_arm64", - sha256 = "d7c7af5d86f43a885069408a89788f67f248e8124c682bb73936f33874e0611b", - urls = [ - "http://ftp.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", - "http://http.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", - "http://ftp.uk.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", - "http://ftp.au.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", - ], - ) - - http_file( - name = "libtinfo6_amd64", - sha256 = "92ac8a8c12f02a6fe08c47f33ea6fb313e1b9480484e26eab34e2058ea59fdb4", - urls = [ - "http://ftp.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", - "http://http.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", - "http://ftp.uk.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", - "http://ftp.au.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", - ], - ) - - http_file( - name = "libtinfo6_arm64", - sha256 = "8282a785437b305bca7758aba19252bd81b5d0d2a54b709af97e682516f1cf4e", - urls = [ - "http://ftp.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", - "http://http.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", - "http://ftp.uk.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", - "http://ftp.au.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", - ], - ) + http_file( + name = "bash_amd64", + sha256 = "f702ef058e762d7208a9c83f6f6bbf02645533bfd615c54e8cdcce842cd57377", + urls = [ + "http://ftp.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", + "http://http.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", + "http://ftp.uk.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", + "http://ftp.au.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb", + ], + ) + http_file( + name = "bash_arm64", + sha256 = "d7c7af5d86f43a885069408a89788f67f248e8124c682bb73936f33874e0611b", + urls = [ + "http://ftp.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", + "http://http.us.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", + "http://ftp.uk.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", + "http://ftp.au.debian.org/debian/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb", + ], + ) + http_file( + name = "libtinfo6_amd64", + sha256 = "92ac8a8c12f02a6fe08c47f33ea6fb313e1b9480484e26eab34e2058ea59fdb4", + urls = [ + "http://ftp.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", + "http://http.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", + "http://ftp.uk.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", + "http://ftp.au.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_amd64.deb", + ], + ) + + http_file( + name = "libtinfo6_arm64", + sha256 = "8282a785437b305bca7758aba19252bd81b5d0d2a54b709af97e682516f1cf4e", + urls = [ + "http://ftp.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", + "http://http.us.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", + "http://ftp.uk.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", + "http://ftp.au.debian.org/debian/pool/main/n/ncurses/libtinfo6_6.2+20201114-2+deb11u1_arm64.deb", + ], + ) diff --git a/tools/prysm_image.bzl b/tools/prysm_image.bzl index 55dcbc752a99..f0ab179c59ea 100644 --- a/tools/prysm_image.bzl +++ b/tools/prysm_image.bzl @@ -3,16 +3,17 @@ load("@rules_pkg//:pkg.bzl", "pkg_tar") load("//tools:multi_arch.bzl", "multi_arch") def prysm_image_upload( - name, - binary, - entrypoint, - symlinks, - repository): - + name, + binary, + entrypoint, + symlinks, + repository, + tags): pkg_tar( name = "binary_tar", srcs = [binary], - symlinks=symlinks, + symlinks = symlinks, + tags = tags, ) oci_image( @@ -25,6 +26,7 @@ def prysm_image_upload( "//tools:bash_tar", ":binary_tar", ], + tags = tags, ) multi_arch( @@ -34,6 +36,7 @@ def prysm_image_upload( "@io_bazel_rules_go//go/toolchain:linux_amd64_cgo", "@io_bazel_rules_go//go/toolchain:linux_arm64_cgo", ], + tags = tags, ) oci_image_index( @@ -41,10 +44,12 @@ def prysm_image_upload( images = [ ":oci_multiarch", ], + tags = tags, ) oci_push( name = name, image = ":oci_image_index", repository = repository, - ) \ No newline at end of file + tags = tags, + ) diff --git a/tools/ssz.bzl b/tools/ssz.bzl index ebe07341975c..7dc7dae54d87 100644 --- a/tools/ssz.bzl +++ b/tools/ssz.bzl @@ -83,4 +83,4 @@ ssz_gen_marshal = rule( outputs = {"out": "generated.ssz.go"}, ) -SSZ_DEPS = ["@com_github_prysmaticlabs_fastssz//:go_default_library"] \ No newline at end of file +SSZ_DEPS = ["@com_github_prysmaticlabs_fastssz//:go_default_library"] diff --git a/tools/target_migration.bzl b/tools/target_migration.bzl index 11e8589ec10f..1df8c88e91de 100644 --- a/tools/target_migration.bzl +++ b/tools/target_migration.bzl @@ -1,8 +1,8 @@ def moved_targets(targets, new_package): - for target in targets: - native.alias( - name=target[1:], - actual=new_package+target, - deprecation="This target has moved to %s%s"%(new_package,target), - tags = ["manual"], - ) + for target in targets: + native.alias( + name = target[1:], + actual = new_package + target, + deprecation = "This target has moved to %s%s" % (new_package, target), + tags = ["manual"], + )