Merge pull request #589 from wking/golint-requires-go-1.6

Makefile: Require Go >= 1.6 for golint
opencontainers · Oct 18, 2016 · d6d6839 · d6d6839
2 parents a39be46 + a9c0235
commit d6d6839
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -73,7 +73,7 @@ test: .govet .golint .gitvalidation
 
 # `go get github.com/golang/lint/golint`
 .golint:
-ifeq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
+ifeq ($(call ALLOWED_GO_VERSION,1.6,$(HOST_GOLANG_VERSION)),true)
 	@which golint > /dev/null 2>/dev/null || (echo "ERROR: golint not found. Consider 'make install.tools' target" && false)
 	golint ./...
 endif
@@ -92,9 +92,9 @@ endif
 .PHONY: install.tools
 install.tools: .install.golint .install.gitvalidation
 
-# golint does not even build for <go1.5
+# golint does not even build for <go1.6
 .install.golint:
-ifeq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
+ifeq ($(call ALLOWED_GO_VERSION,1.6,$(HOST_GOLANG_VERSION)),true)
 	go get -u github.com/golang/lint/golint
 endif