Merge pull request #2346 from kolyshkin/golangci-lint

ci: fixups to golangci lint configuration

common/.cirrus.yml

@@ -9,7 +9,6 @@ env:
     GOPATH: &gopath "/var/tmp/go"
     GOBIN: "${GOPATH}/bin"
     GOCACHE: "${GOPATH}/cache"
-    GOLANGCI_LINT_CACHE: "$GOCACHE"
     GOSRC: &gosrc "${GOPATH}/src/github.com/containers/common"
     CIRRUS_WORKING_DIR: *gosrc
     # The default is 'sh' if unspecified
@@ -47,7 +46,6 @@ testing_task:
   env:
     NETAVARK_BINARY: "/usr/libexec/podman/netavark"
   test_script:
-    - mkdir "$GOLANGCI_LINT_CACHE"
     - export PATH="$PATH:$GOPATH/bin"
     - gpg --batch --passphrase '' --quick-gen-key tester@localhost default default never
     - make vendor

common/.golangci.yml

@@ -30,7 +30,6 @@ linters:
     - exhaustive
     - gochecknoglobals
     - err113
-    - gomnd
     - nolintlint
     - wrapcheck
     - varnamelen
@@ -46,7 +45,6 @@ linters:
     - maintidx
     - ireturn
     - exhaustruct
-    - execinquery
     - gosec
     - godot
     - gocyclo

common/Makefile

@@ -71,8 +71,8 @@ docs:
 	$(MAKE) -C docs
 
 .PHONY: validate
-validate: build/golangci-lint
+validate:
-	./build/golangci-lint run
+	golangci-lint run
 	./tools/validate_seccomp.sh ./pkg/seccomp
 
 vendor-in-container:
@@ -85,12 +85,9 @@ vendor:
 	$(GO) mod verify
 
 .PHONY: install.tools
-install.tools: build/golangci-lint .install.md2man
+install.tools: .install.md2man
-
-build/golangci-lint: VERSION=v1.60.3
-build/golangci-lint:
-	curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/$(VERSION)/install.sh | sh -s -- -b ./build $(VERSION)
 
+.PHONY: .install.md2man
 .install.md2man:
 	$(GO) install github.com/cpuguy83/go-md2man/v2@latest