Merge pull request #176 from govau/fixnogopath
Stop assuming that GOPATH is always set, and is a single directory
commitdf6b6b7ce0e06bdb81f0db71be541ece7296b971
authorJoel Speed <Joel.speed@hotmail.co.uk>
dateMon 3 Jun 2019, 16:21 (7 years ago)
parent40cf6b23747563
.travis.yml+3−3
@@ -6,10 +6,10 @@ install:
66 - wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
77 - chmod +x dep
88 - mv dep $GOPATH/bin/dep
9+ - go get github.com/alecthomas/gometalinter
10+ - gometalinter --install
911script:
10− - ./configure
11− # Run tests
12− - make test
12+ - ./configure && make test
1313sudo: false
1414notifications:
1515 email: false
Makefile+1−8
@@ -15,15 +15,8 @@ clean:
1515distclean: clean
1616 rm -rf vendor
1717
18−BIN_DIR := $(GOPATH)/bin
19−GOMETALINTER := $(BIN_DIR)/gometalinter
20−
21−$(GOMETALINTER):
22− $(GO) get -u github.com/alecthomas/gometalinter
23− gometalinter --install %> /dev/null
24−
2518.PHONY: lint
26−lint: $(GOMETALINTER)
19+lint:
2720 $(GOMETALINTER) --vendor --disable-all \
2821 --enable=vet \
2922 --enable=vetshadow \
configure+2
@@ -126,6 +126,7 @@ check_for go
126126check_go_version
127127check_go_env
128128check_for dep
129+check_for gometalinter
129130
130131echo
131132
@@ -134,6 +135,7 @@ cat <<- EOF > .env
134135 GO := "${tools[go]}"
135136 GO_VERSION := ${tools[go_version]}
136137 DEP := "${tools[dep]}"
138+ GOMETALINTER := "${tools[gometalinter]}"
137139EOF
138140
139141echo "Environment configuration written to .env"