mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-22 03:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update rules_go to v0.29.0 (#10064)

Browse Source 
* Update rules_go, delete patch, fix analyzers, remove old deployContract code, and prune old dependency which was broken in rules_go update

* Undo some WORKSPACE diffs

* Gazelle

* remove nofuzz, fix build issue

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Preston Van Loon 2022-01-31 01:06:07 -06:00 committed by GitHub
parent ef906cf704
commit 98470fdb13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 46 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
BUILD.bazel
View File

@ -86,50 +86,50 @@ nogo(
config = "nogo_config.json", config = "nogo_config.json",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"@org_golang_x_tools//go/analysis/passes/unsafeptr:go_tool_library", "@org_golang_x_tools//go/analysis/passes/unsafeptr:go_default_library",
"@org_golang_x_tools//go/analysis/passes/unreachable:go_tool_library", "@org_golang_x_tools//go/analysis/passes/unreachable:go_default_library",
"@org_golang_x_tools//go/analysis/passes/unmarshal:go_tool_library", "@org_golang_x_tools//go/analysis/passes/unmarshal:go_default_library",
"@org_golang_x_tools//go/analysis/passes/tests:go_tool_library", "@org_golang_x_tools//go/analysis/passes/tests:go_default_library",
"@org_golang_x_tools//go/analysis/passes/structtag:go_tool_library", "@org_golang_x_tools//go/analysis/passes/structtag:go_default_library",
"@org_golang_x_tools//go/analysis/passes/stdmethods:go_tool_library", "@org_golang_x_tools//go/analysis/passes/stdmethods:go_default_library",
"@org_golang_x_tools//go/analysis/passes/shift:go_tool_library", "@org_golang_x_tools//go/analysis/passes/shift:go_default_library",
# "@org_golang_x_tools//go/analysis/passes/shadow:go_tool_library", # "@org_golang_x_tools//go/analysis/passes/shadow:go_default_library",
"@org_golang_x_tools//go/analysis/passes/printf:go_tool_library", "@org_golang_x_tools//go/analysis/passes/printf:go_default_library",
"@org_golang_x_tools//go/analysis/passes/pkgfact:go_tool_library", "@org_golang_x_tools//go/analysis/passes/pkgfact:go_default_library",
"@org_golang_x_tools//go/analysis/passes/nilness:go_tool_library", "@org_golang_x_tools//go/analysis/passes/nilness:go_default_library",
"@org_golang_x_tools//go/analysis/passes/nilfunc:go_tool_library", "@org_golang_x_tools//go/analysis/passes/nilfunc:go_default_library",
"@org_golang_x_tools//go/analysis/passes/loopclosure:go_tool_library", "@org_golang_x_tools//go/analysis/passes/loopclosure:go_default_library",
"@org_golang_x_tools//go/analysis/passes/httpresponse:go_tool_library", "@org_golang_x_tools//go/analysis/passes/httpresponse:go_default_library",
"@org_golang_x_tools//go/analysis/passes/findcall:go_tool_library", "@org_golang_x_tools//go/analysis/passes/findcall:go_default_library",
"@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_tool_library", "@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_default_library",
"@org_golang_x_tools//go/analysis/passes/ctrlflow:go_tool_library", "@org_golang_x_tools//go/analysis/passes/ctrlflow:go_default_library",
"@org_golang_x_tools//go/analysis/passes/copylock:go_tool_library", "@org_golang_x_tools//go/analysis/passes/copylock:go_default_library",
# "@org_golang_x_tools//go/analysis/passes/cgocall:go_tool_library", # "@org_golang_x_tools//go/analysis/passes/cgocall:go_default_library",
"@org_golang_x_tools//go/analysis/passes/buildtag:go_tool_library", "@org_golang_x_tools//go/analysis/passes/buildtag:go_default_library",
"@org_golang_x_tools//go/analysis/passes/buildssa:go_tool_library", "@org_golang_x_tools//go/analysis/passes/buildssa:go_default_library",
"@org_golang_x_tools//go/analysis/passes/bools:go_tool_library", "@org_golang_x_tools//go/analysis/passes/bools:go_default_library",
"@org_golang_x_tools//go/analysis/passes/atomicalign:go_tool_library", "@org_golang_x_tools//go/analysis/passes/atomicalign:go_default_library",
"@org_golang_x_tools//go/analysis/passes/atomic:go_tool_library", "@org_golang_x_tools//go/analysis/passes/atomic:go_default_library",
"@org_golang_x_tools//go/analysis/passes/assign:go_tool_library", "@org_golang_x_tools//go/analysis/passes/assign:go_default_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library", "@org_golang_x_tools//go/analysis/passes/inspect:go_default_library",
"@org_golang_x_tools//go/analysis/passes/asmdecl:go_tool_library", "@org_golang_x_tools//go/analysis/passes/asmdecl:go_default_library",
"//tools/analyzers/maligned:go_tool_library", "//tools/analyzers/maligned:go_default_library",
"//tools/analyzers/cryptorand:go_tool_library", "//tools/analyzers/cryptorand:go_default_library",
"//tools/analyzers/errcheck:go_tool_library", "//tools/analyzers/errcheck:go_default_library",
"//tools/analyzers/featureconfig:go_tool_library", "//tools/analyzers/featureconfig:go_default_library",
"//tools/analyzers/comparesame:go_tool_library", "//tools/analyzers/comparesame:go_default_library",
"//tools/analyzers/shadowpredecl:go_tool_library", "//tools/analyzers/shadowpredecl:go_default_library",
"//tools/analyzers/nop:go_tool_library", "//tools/analyzers/nop:go_default_library",
"//tools/analyzers/slicedirect:go_tool_library", "//tools/analyzers/slicedirect:go_default_library",
"//tools/analyzers/interfacechecker:go_tool_library", "//tools/analyzers/interfacechecker:go_default_library",
"//tools/analyzers/ineffassign:go_tool_library", "//tools/analyzers/ineffassign:go_default_library",
"//tools/analyzers/properpermissions:go_tool_library", "//tools/analyzers/properpermissions:go_default_library",
] + select({ ] + select({
# nogo checks that fail with coverage enabled. # nogo checks that fail with coverage enabled.
":coverage_enabled": [], ":coverage_enabled": [],
"//conditions:default": [ "//conditions:default": [
"@org_golang_x_tools//go/analysis/passes/lostcancel:go_tool_library", "@org_golang_x_tools//go/analysis/passes/lostcancel:go_default_library",
"@org_golang_x_tools//go/analysis/passes/composite:go_tool_library", "@org_golang_x_tools//go/analysis/passes/composite:go_default_library",
], ],
}), }),
) )

15
WORKSPACE
View File

@ -60,10 +60,10 @@ bazel_skylib_workspace()
http_archive( http_archive(
name = "bazel_gazelle", name = "bazel_gazelle",
sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f", sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
urls = [ urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz", "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
], ],
) )
@ -85,16 +85,13 @@ http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
patch_args = ["-p1"], patch_args = ["-p1"],
patches = [ patches = [
# Required until https://github.com/bazelbuild/rules_go/pull/2450 merges otherwise nilness
# nogo check fails for certain third_party dependencies.
"//third_party:io_bazel_rules_go.patch",
# Expose internals of go_test for custom build transitions. # Expose internals of go_test for custom build transitions.
"//third_party:io_bazel_rules_go_test.patch", "//third_party:io_bazel_rules_go_test.patch",
], ],
sha256 = "7c10271940c6bce577d51a075ae77728964db285dac0a46614a7934dc34303e6", sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f",
urls = [ urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.26.0/rules_go-v0.26.0.tar.gz", "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.26.0/rules_go-v0.26.0.tar.gz", "https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
], ],
) )

22
third_party/io_bazel_rules_go.patch vendored
View File

@ -1,22 +0,0 @@
diff --git a/go/tools/builders/nogo_main.go b/go/tools/builders/nogo_main.go
index 2830a666..ce0e6e39 100644
--- a/go/tools/builders/nogo_main.go
+++ b/go/tools/builders/nogo_main.go
@@ -386,13 +386,11 @@ func checkAnalysisResults(actions []*action, pkg *goPackage) string {
}
// Discard diagnostics based on the analyzer configuration.
for _, d := range act.diagnostics {
- // NOTE(golang.org/issue/31008): nilness does not set positions,
- // so don't assume the position is valid.
- f := pkg.fset.File(d.Pos)
- filename := "-"
- if f != nil {
- filename = f.Name()
+ file := pkg.fset.File(d.Pos)
+ if file == nil {
+ continue
}
+ filename := file.Name()
include := true
if len(config.onlyFiles) > 0 {
// This analyzer emits diagnostics for only a set of files.

13
tools/analyzers/comparesame/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,16 +12,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/comparesame",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

13
tools/analyzers/cryptorand/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,16 +12,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/cryptorand",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

13
tools/analyzers/errcheck/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library", "go_test") load("@prysm//tools/go:def.bzl", "go_library", "go_test")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,18 +12,6 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "errcheck",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["embedded_walker_test.go"], srcs = ["embedded_walker_test.go"],

13
tools/analyzers/featureconfig/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -12,15 +11,3 @@ go_library(
"@org_golang_x_tools//go/ast/inspector:go_default_library", "@org_golang_x_tools//go/ast/inspector:go_default_library",
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "featureconfig",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)

16
tools/analyzers/ineffassign/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -16,19 +15,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = [
"analyzer.go",
"ineffassign.go",
],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/ineffassign",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

13
tools/analyzers/interfacechecker/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -12,15 +11,3 @@ go_library(
"@org_golang_x_tools//go/ast/inspector:go_default_library", "@org_golang_x_tools//go/ast/inspector:go_default_library",
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "interfacechecker",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)

16
tools/analyzers/maligned/BUILD.bazel
View File

@ -1,20 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_tool_library(
name = "go_tool_library",
srcs = [
"analyzer.go",
"maligned.go",
],
importpath = "maligned",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
go_library( go_library(
name = "go_default_library", name = "go_default_library",

13
tools/analyzers/nop/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,16 +12,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/nop",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

13
tools/analyzers/properpermissions/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,16 +12,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/properpermissions",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

15
tools/analyzers/recursivelock/BUILD.bazel
View File

@ -1,4 +1,3 @@
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
go_library( go_library(
@ -15,18 +14,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/recursivelock",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/astutil:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
"@org_golang_x_tools//go/types/typeutil:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

13
tools/analyzers/shadowpredecl/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,16 +12,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/shadowpredecl",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go

13
tools/analyzers/slicedirect/BUILD.bazel
View File

@ -1,5 +1,4 @@
load("@prysm//tools/go:def.bzl", "go_library") load("@prysm//tools/go:def.bzl", "go_library")
load("@io_bazel_rules_go//go:def.bzl", "go_tool_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
@ -13,16 +12,4 @@ go_library(
], ],
) )
go_tool_library(
name = "go_tool_library",
srcs = ["analyzer.go"],
importpath = "github.com/prysmaticlabs/prysm/tools/analyzers/slicedirect",
visibility = ["//visibility:public"],
deps = [
"@org_golang_x_tools//go/analysis:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/ast/inspector:go_tool_library",
],
)
# gazelle:exclude analyzer_test.go # gazelle:exclude analyzer_test.go