[NO TESTS NEEDED] Update linter

Signed-off-by: Matej Vasek <[email protected]>
jvanz · Feb 10, 2021 · 6813341 · 6813341
1 parent 2d829ae
commit 6813341
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git 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

diff --git a/Makefile b/Makefile
@@ -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
@@ -1,3 +1,5 @@
+// +build !linter
+
 package dependencies
 
 import (

diff --git 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
@@ -1,5 +1,3 @@
-// +build !remote
-
 package abi
 
 import (