update golangci-lint to v1.49.0

thaJeztah · thaJeztah · commit 8b5df7d347b6 · 2022-10-12T14:41:01.000+02:00
Also remove "nolint" comments for deadcode, which is deprecated, and removed
from the defaults.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func setCPU(s *Spec) {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`-//nolint:deadcode,nolintlint,unused // not used on all platforms`
	`106`	`+//nolint:nolintlint,unused // not used on all platforms`
`107`	`107`	`func setCPUWindows(s *Spec) {`
`108`	`108`	`setResourcesWindows(s)`
`109`	`109`	`if s.Windows != nil {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ package progress`
`19`	`19`	`const (`
`20`	`20`	`escape = "\x1b"`
`21`	`21`	`reset = escape + "[0m"`
`22`		`- red = escape + "[31m" //nolint:deadcode,nolintlint,unused,varcheck`
	`22`	`+ red = escape + "[31m" //nolint:nolintlint,unused,varcheck`
`23`	`23`	`green = escape + "[32m"`
`24`	`24`	`)`
-Original file line number
+Diff line change
 go install github.com/containerd/[email protected]
 go install github.com/containerd/protobuild/cmd/[email protected]
 go install github.com/cpuguy83/go-md2man/[email protected]
 -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/[email protected]
 go install google.golang.org/grpc/cmd/[email protected]
 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@944ef4a40df3446714a823207972b7d9858ffac5