From 1e3cd5b052ef5a6728deb3e80d5a92875ca8d4bb Mon Sep 17 00:00:00 2001
From: Phil Estes <estesp@linux.vnet.ibm.com>
Date: Thu, 19 Sep 2019 09:23:12 -0400
Subject: [PATCH] Move golangci-lint configuration out of Makefile

Add 2m deadline; similar to containerd, recent issues with golangci-lint
taking more than 1 minute (seen in recent containerd/cri PRs as well).

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
---
 .golangci.yml | 22 ++++++++++++++++++++++
 Makefile      |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 .golangci.yml

diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 000000000..3046f2ac7
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,22 @@
+linters:
+  enable:
+    - structcheck
+    - varcheck
+    - staticcheck
+    - unconvert
+    - gofmt
+    - goimports
+    - golint
+    - ineffassign
+    - vet
+    - unused
+    - misspell
+  disable:
+    - errcheck
+
+run:
+  deadline: 2m
+  skip-dirs:
+    - integration
+  skip-files:
+    - ".*_test.go" 
diff --git a/Makefile b/Makefile
index b3cbed693..5dbfc819d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ version: ## print current cri plugin release version
 
 lint:
 	@echo "$(WHALE) $@"
-	golangci-lint run --skip-files .*_test.go --skip-dirs='(integration)'
+	golangci-lint run
 
 gofmt:
 	@echo "$(WHALE) $@"