From 8b5df7d347b689a093ecc4bbb05a75d3c091fbeb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 31 Aug 2022 09:44:08 +0200 Subject: [PATCH] update golangci-lint to v1.49.0 Also remove "nolint" comments for deadcode, which is deprecated, and removed from the defaults. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 2 +- oci/spec_opts.go | 2 +- oci/utils_unix.go | 2 +- pkg/progress/escape.go | 2 +- script/setup/install-dev-tools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1fc583cb..a40497118 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v2 - uses: golangci/golangci-lint-action@v3 with: - version: v1.48.0 + version: v1.49.0 skip-cache: true args: --timeout=8m diff --git a/oci/spec_opts.go b/oci/spec_opts.go index f5e69860f..e13b9a498 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -103,7 +103,7 @@ func setCPU(s *Spec) { } } -//nolint:deadcode,nolintlint,unused // not used on all platforms +//nolint:nolintlint,unused // not used on all platforms func setCPUWindows(s *Spec) { setResourcesWindows(s) if s.Windows != nil { diff --git a/oci/utils_unix.go b/oci/utils_unix.go index 798680ab9..306f09814 100644 --- a/oci/utils_unix.go +++ b/oci/utils_unix.go @@ -127,7 +127,7 @@ func getDevices(path, containerPath string) ([]specs.LinuxDevice, error) { // TODO consider adding these consts to the OCI runtime-spec. const ( - wildcardDevice = "a" //nolint:deadcode,nolintlint,unused,varcheck // currently unused, but should be included when upstreaming to OCI runtime-spec. + wildcardDevice = "a" //nolint:nolintlint,unused,varcheck // currently unused, but should be included when upstreaming to OCI runtime-spec. blockDevice = "b" charDevice = "c" // or "u" fifoDevice = "p" diff --git a/pkg/progress/escape.go b/pkg/progress/escape.go index 6455c305e..394686f46 100644 --- a/pkg/progress/escape.go +++ b/pkg/progress/escape.go @@ -19,6 +19,6 @@ package progress const ( escape = "\x1b" reset = escape + "[0m" - red = escape + "[31m" //nolint:deadcode,nolintlint,unused,varcheck + red = escape + "[31m" //nolint:nolintlint,unused,varcheck green = escape + "[32m" ) diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index 078974571..c1afbe662 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -24,7 +24,7 @@ set -eu -o pipefail go install github.com/containerd/protobuild@v0.2.0 go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0 go install github.com/cpuguy83/go-md2man/v2@v2.0.1 -go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.48.0 +go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0 go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@944ef4a40df3446714a823207972b7d9858ffac5