From c50d969a0e79161c9d5d6f7933009253b067233e Mon Sep 17 00:00:00 2001
From: Matej Vasek <mvasek@redhat.com>
Date: Tue, 9 Feb 2021 19:23:32 +0100
Subject: [NO TESTS NEEDED] Update linter

Signed-off-by: Matej Vasek <mvasek@redhat.com>
---
 .golangci.yml                    | 29 +++++++++++++++++++++++++++++
 Makefile                         |  2 +-
 dependencies/dependencies.go     |  2 ++
 hack/golangci-lint.sh            |  2 +-
 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
diff --git a/Makefile b/Makefile
index 11a46f5ce..6b9736c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -609,7 +609,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 50bf29bb8..984fb42f2 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 139032ad6..e3cf20863 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -1,5 +1,3 @@
-// +build !remote
-
 package abi
 
 import (
-- 
cgit v1.2.3-54-g00ecf