diff options
author | Nick Thomas <nick@gitlab.com> | 2017-01-06 16:24:32 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-01-06 16:24:32 +0300 |
commit | 753b2973685a76457c47f989a5371e4c9696ea2f (patch) | |
tree | b535c6402296117a123c583aaa214ce0f1d72a1d | |
parent | 62b22d776ebf3115e0ed2ae46191f40ae71fc0a7 (diff) | |
parent | 94d6af8194315045bee5b446f6590f21903d8024 (diff) |
Merge branch '40-fix-ci' into 'master'
Don't run lint on go1.5, but run everything on go1.6 and go1.7
Closes #40
See merge request !10
-rw-r--r-- | .gitlab-ci.yml | 13 | ||||
-rw-r--r-- | Makefile | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 205463ff..0c282ccf 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 @@ -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 }' |