From 480e95559f61d0c15b767271d732f3b352fd9a57 Mon Sep 17 00:00:00 2001 From: Lukas Vogel Date: Fri, 29 Oct 2021 16:39:59 +0200 Subject: [PATCH] build: upgrade rules_go to 0.29 and gazelle to 0.24 GitOrigin-RevId: 368e746a0e635c7ab349fbb4d18272257d7644fd --- WORKSPACE | 12 ++++----- go/lint/BUILD.bazel | 10 ++++---- nogo.bzl | 62 ++++++++++++++++++++++----------------------- tool_deps.bzl | 3 +-- 4 files changed, 43 insertions(+), 44 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b37bac46de..5062d43441 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -32,10 +32,10 @@ lint_setup({ # Bazel rules for Golang http_archive( name = "io_bazel_rules_go", - sha256 = "8e968b5fcea1d2d64071872b12737bbb5514524ee5f0a4f54f5920266c261acb", + sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip", + "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.29.0/rules_go-v0.29.0.zip", ], ) @@ -49,10 +49,10 @@ go_register_toolchains( # Gazelle http_archive( name = "bazel_gazelle", - sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f", + sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", urls = [ - "https://mirror.bazel.build/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.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.24.0/bazel-gazelle-v0.24.0.tar.gz", ], ) diff --git a/go/lint/BUILD.bazel b/go/lint/BUILD.bazel index 9671814e2c..50466e8d69 100644 --- a/go/lint/BUILD.bazel +++ b/go/lint/BUILD.bazel @@ -1,15 +1,15 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_tool_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") #gazelle:ignore gazelle would add a go_library block which we don't need here. -go_tool_library( +go_library( name = "log", srcs = ["log.go"], importpath = "lint", 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", + "@org_golang_x_tools//go/analysis:go_default_library", + "@org_golang_x_tools//go/analysis/passes/inspect:go_default_library", + "@org_golang_x_tools//go/ast/inspector:go_default_library", ], ) diff --git a/nogo.bzl b/nogo.bzl index 44752a5ea7..400142ac28 100644 --- a/nogo.bzl +++ b/nogo.bzl @@ -1,36 +1,36 @@ nogo_deps = [ "@com_github_scionproto_scion//go/lint:log", - "@com_github_oncilla_gochecks//logcheck:go_tool_library", - "@com_github_oncilla_gochecks//serrorscheck:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/asmdecl:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/assign:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/atomic:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/atomicalign:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/bools:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/buildtag:go_tool_library", + "@com_github_oncilla_gochecks//logcheck:go_default_library", + "@com_github_oncilla_gochecks//serrorscheck:go_default_library", + "@org_golang_x_tools//go/analysis/passes/asmdecl:go_default_library", + "@org_golang_x_tools//go/analysis/passes/assign:go_default_library", + "@org_golang_x_tools//go/analysis/passes/atomic:go_default_library", + "@org_golang_x_tools//go/analysis/passes/atomicalign:go_default_library", + "@org_golang_x_tools//go/analysis/passes/bools:go_default_library", + "@org_golang_x_tools//go/analysis/passes/buildtag:go_default_library", # This crashes the build of @com_github_vishvananda_netlink - # "@org_golang_x_tools//go/analysis/passes/cgocall:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/composite:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/copylock:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/errorsas:go_tool_library", + # "@org_golang_x_tools//go/analysis/passes/cgocall:go_default_library", + "@org_golang_x_tools//go/analysis/passes/composite:go_default_library", + "@org_golang_x_tools//go/analysis/passes/copylock:go_default_library", + "@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_default_library", + "@org_golang_x_tools//go/analysis/passes/errorsas:go_default_library", # We have uncountable violations of fieldalignment. - # "@org_golang_x_tools//go/analysis/passes/fieldalignment:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/httpresponse:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/ifaceassert:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/loopclosure:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/lostcancel:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/nilfunc:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/nilness:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/printf:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/shift:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/sortslice:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/stdmethods:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/stringintconv:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/structtag:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/tests:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/unmarshal:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/unreachable:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/unsafeptr:go_tool_library", - "@org_golang_x_tools//go/analysis/passes/unusedresult:go_tool_library", + # "@org_golang_x_tools//go/analysis/passes/fieldalignment:go_default_library", + "@org_golang_x_tools//go/analysis/passes/httpresponse:go_default_library", + "@org_golang_x_tools//go/analysis/passes/ifaceassert:go_default_library", + "@org_golang_x_tools//go/analysis/passes/loopclosure:go_default_library", + "@org_golang_x_tools//go/analysis/passes/lostcancel:go_default_library", + "@org_golang_x_tools//go/analysis/passes/nilfunc:go_default_library", + "@org_golang_x_tools//go/analysis/passes/nilness:go_default_library", + "@org_golang_x_tools//go/analysis/passes/printf:go_default_library", + "@org_golang_x_tools//go/analysis/passes/shift:go_default_library", + "@org_golang_x_tools//go/analysis/passes/sortslice:go_default_library", + "@org_golang_x_tools//go/analysis/passes/stdmethods:go_default_library", + "@org_golang_x_tools//go/analysis/passes/stringintconv:go_default_library", + "@org_golang_x_tools//go/analysis/passes/structtag:go_default_library", + "@org_golang_x_tools//go/analysis/passes/tests:go_default_library", + "@org_golang_x_tools//go/analysis/passes/unmarshal:go_default_library", + "@org_golang_x_tools//go/analysis/passes/unreachable:go_default_library", + "@org_golang_x_tools//go/analysis/passes/unsafeptr:go_default_library", + "@org_golang_x_tools//go/analysis/passes/unusedresult:go_default_library", ] diff --git a/tool_deps.bzl b/tool_deps.bzl index 927b4e3927..6a099dd823 100644 --- a/tool_deps.bzl +++ b/tool_deps.bzl @@ -35,8 +35,7 @@ def tool_deps(): go_repository( name = "com_github_oncilla_gochecks", commit = "954a3ef2d56471a40cc0c6fcb86e1e9a3b21949e", - importpath = "github.com/oncilla/gochecks", # serrorscheck - build_file_generation = "off", + importpath = "github.com/oncilla/gochecks", ) go_repository(