From 94d6af8194315045bee5b446f6590f21903d8024 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Fri, 6 Jan 2017 13:16:34 +0000
Subject: [PATCH] Don't run lint on go1.5, but run everything on go1.6 and
go1.7
---
.gitlab-ci.yml | 13 ++++++++++++-
Makefile | 3 ++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 205463f..0c282cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,17 @@ before_script:
- ln -sfv "$(pwd -P)" "$GODIR"
- cd "$GODIR"
-test:
+test:1.5:
+ image: golang:1.5
+ script:
+ - make verify-lite
+
+test:1.6:
+ image: golang:1.6
+ script:
+ - make verify
+
+test:1.7:
+ image: golang:1.7
script:
- make verify
diff --git a/Makefile b/Makefile
index 3ad0447..21ccf07 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ gitlab-pages: $(GO_FILES)
update:
godep save ./...
-verify: fmt vet lint complexity test
+verify-lite: fmt vet complexity test # lint does not work on go1.5 any more
+verify: verify-lite lint
fmt:
go fmt ./... | awk '{ print "Please run go fmt"; exit 1 }'
--
GitLab