diff --git a/.travis.yml b/.travis.yml index a93458f9..60816467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,14 @@ go: - 1.9.x - 1.10.x - 1.11.x + env: GO111MODULE=on git: depth: 10 +before_install: + - if [[ "$GO111MODULE" = "on" ]]; then mkdir "$HOME/go"; export GOPATH="$HOME/go"; fi + install: - make install diff --git a/Makefile b/Makefile index 51b9969f..a98fc0a1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,11 @@ GOFILES := $(shell find . -name "*.go" -type f -not -path "./vendor/*") all: install install: deps - govendor sync + @hash go help mod > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + go mod download; \ + else \ + govendor sync; \ + fi .PHONY: test test: @@ -30,8 +34,10 @@ vet: go vet $(VETPACKAGES) deps: - @hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/kardianos/govendor; \ + @hash go help mod > /dev/null 2>&1; if [ $$? -eq 0 ]; then \ + @hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + go get -u github.com/kardianos/govendor; \ + fi \ fi @hash embedmd > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ go get -u github.com/campoy/embedmd; \