diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-10 10:26:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 10:26:39 -0500 |
| commit | 871562f9fe0d9b2b8975bd30ac07f94054f8bef9 (patch) | |
| tree | 2efcf8a7e0ab05fd6e22a88a38b8ed071d41f05b | |
| parent | b4ca924365869d73aecd10bb99656b99ab8bf0ae (diff) | |
| parent | 68133414f42483c5122d2fe6916e179cbbb9d756 (diff) | |
| download | podman-871562f9fe0d9b2b8975bd30ac07f94054f8bef9.tar.gz podman-871562f9fe0d9b2b8975bd30ac07f94054f8bef9.tar.bz2 podman-871562f9fe0d9b2b8975bd30ac07f94054f8bef9.zip | |
Merge pull request #9294 from matejvasek/update_linter
Update golangci-lint
| -rw-r--r-- | .golangci.yml | 29 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | dependencies/dependencies.go | 2 | ||||
| -rwxr-xr-x | hack/golangci-lint.sh | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/manifest.go | 2 |
5 files changed, 33 insertions, 4 deletions
diff --git a/.golangci.yml b/.golangci.yml index da22b7602..6e46d55cd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,6 +4,7 @@ run: deadline: 5m skip-dirs-use-default: true skip-dirs: + - dependencies - contrib - dependencies - test @@ -17,6 +18,34 @@ linters: enable-all: true disable: # All these break for one reason or another + - nolintlint + - gocognit + - stylecheck + - testpackage + - goerr113 + - exhaustivestruct + - errorlint + - wrapcheck + - paralleltest + - wsl + - godox + - tparallel + - gomnd + - nlreturn + - noctx + - nestif + - predeclared + - thelper + - ifshort + - staticcheck + - forbidigo + - exhaustive + - whitespace + - unparam + - gofumpt + - gci + - godot + - makezero - dupl - funlen - gochecknoglobals @@ -619,7 +619,7 @@ endef .PHONY: .install.golangci-lint .install.golangci-lint: .gopathok - VERSION=1.18.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh + VERSION=1.36.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh .PHONY: .install.bats .install.bats: .gopathok diff --git a/dependencies/dependencies.go b/dependencies/dependencies.go index b03ab149b..b1b0aee08 100644 --- a/dependencies/dependencies.go +++ b/dependencies/dependencies.go @@ -1,3 +1,5 @@ +// +build !linter + package dependencies import ( diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh index 5be750129..bcb83a2fd 100755 --- a/hack/golangci-lint.sh +++ b/hack/golangci-lint.sh @@ -5,7 +5,7 @@ set -e declare -A BUILD_TAGS # TODO: add systemd tag -BUILD_TAGS[default]="apparmor,seccomp,selinux" +BUILD_TAGS[default]="apparmor,seccomp,selinux,linter" BUILD_TAGS[abi]="${BUILD_TAGS[default]},!remoteclient" BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},remote,remoteclient" diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index 626f1f7bf..da7482407 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -1,5 +1,3 @@ -// +build !remote - package abi import ( |