From 0893821e35e7a2bec538729a09c19c6a4d9ddfac Mon Sep 17 00:00:00 2001 From: kasey <489222+kasey@users.noreply.github.com> Date: Tue, 7 Mar 2023 10:25:35 -0600 Subject: [PATCH] Disable conditional go 1.20 code until module is also at 1.20 (#12084) * disable conditional go 1.20 code until we upgrade * bazel decided this was unreachable and removed it! --------- Co-authored-by: kasey --- encoding/bytesutil/BUILD.bazel | 1 - encoding/bytesutil/bytes_go120.go | 4 ++-- encoding/bytesutil/bytes_legacy.go | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/encoding/bytesutil/BUILD.bazel b/encoding/bytesutil/BUILD.bazel index 86be6c842..52f5e9992 100644 --- a/encoding/bytesutil/BUILD.bazel +++ b/encoding/bytesutil/BUILD.bazel @@ -5,7 +5,6 @@ go_library( srcs = [ "bits.go", "bytes.go", - "bytes_go120.go", "bytes_legacy.go", "eth_types.go", "hex.go", diff --git a/encoding/bytesutil/bytes_go120.go b/encoding/bytesutil/bytes_go120.go index e35dfa179..5666fdfb4 100644 --- a/encoding/bytesutil/bytes_go120.go +++ b/encoding/bytesutil/bytes_go120.go @@ -1,5 +1,5 @@ -//go:build go1.20 -// +build go1.20 +//go:build prysmAt1.20 +// +build prysmAt1.20 package bytesutil diff --git a/encoding/bytesutil/bytes_legacy.go b/encoding/bytesutil/bytes_legacy.go index 7ede8a934..452512197 100644 --- a/encoding/bytesutil/bytes_legacy.go +++ b/encoding/bytesutil/bytes_legacy.go @@ -1,5 +1,5 @@ -//go:build !go1.20 -// +build !go1.20 +//go:build !prysmAt1.20 +// +build !prysmAt1.20 package bytesutil