diff --git a/.travis.yml b/.travis.yml index d3ea1a9..d1151db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ install: - wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 - chmod +x dep - mv dep $GOPATH/bin/dep + - go get github.com/alecthomas/gometalinter + - gometalinter --install script: - - ./configure - # Run tests - - make test + - ./configure && make test sudo: false notifications: email: false diff --git a/Makefile b/Makefile index 0dca566..09ff1bb 100644 --- a/Makefile +++ b/Makefile @@ -15,15 +15,8 @@ clean: distclean: clean rm -rf vendor -BIN_DIR := $(GOPATH)/bin -GOMETALINTER := $(BIN_DIR)/gometalinter - -$(GOMETALINTER): - $(GO) get -u github.com/alecthomas/gometalinter - gometalinter --install %> /dev/null - .PHONY: lint -lint: $(GOMETALINTER) +lint: $(GOMETALINTER) --vendor --disable-all \ --enable=vet \ --enable=vetshadow \ diff --git a/configure b/configure index fa80a9f..5d74683 100755 --- a/configure +++ b/configure @@ -126,6 +126,7 @@ check_for go check_go_version check_go_env check_for dep +check_for gometalinter echo @@ -134,6 +135,7 @@ cat <<- EOF > .env GO := "${tools[go]}" GO_VERSION := ${tools[go_version]} DEP := "${tools[dep]}" + GOMETALINTER := "${tools[gometalinter]}" EOF echo "Environment configuration written to .env"