Merge pull request #150 from vbatts/golint

travis, golint, and versions of golang!
This commit is contained in:
Vincent Batts 2018-11-08 11:56:25 -05:00 committed by GitHub
commit 4ae4c48dc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

View file

@ -1,9 +1,10 @@
language: go
go:
- 1.x
- 1.10.x
- 1.9.x
- 1.8.x
- "1.x"
- "1.11.x"
- "1.10.x"
- "1.9.x"
- "1.8.x"
sudo: false

View file

@ -32,7 +32,11 @@ lint: .lint
CLEAN_FILES += .lint
.lint: $(SOURCE_FILES)
set -e ; for dir in $$(glide novendor) ; do golint -set_exit_status $$dir ; done && touch $@
if [[ "$(go version |awk '{ print $3 }')" =~ ^go1\.11\. ]] ; then \
set -e ; for dir in $$(glide novendor) ; do golint -set_exit_status $$dir ; done && touch $@ \
else \
touch $@ ; \
fi
.PHONY: vet
vet: .vet .vet.tags
@ -64,7 +68,7 @@ $(BUILD): $(SOURCE_FILES)
install.tools:
go get -u -v github.com/Masterminds/glide
go get -u -v golang.org/x/lint/golint
if [[ "$(go version |awk '{ print $3 }')" =~ ^go1\.11\. ]] ; then go get -u golang.org/x/lint/golint ; fi
./bin:
mkdir -p $@