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..726a161c 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,16 @@ vet: go vet $(VETPACKAGES) deps: - @hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/kardianos/govendor; \ - fi - @hash embedmd > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/campoy/embedmd; \ + @hash go help mod > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + go mod download; \ + go install github.com/campoy/embedmd; \ + else \ + @hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + go get -u github.com/kardianos/govendor; \ + fi + @hash embedmd > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + go get -u github.com/campoy/embedmd; \ + fi \ fi embedmd: