From 697f3bb5e0fcab0824767cb940d5d2de6868327a Mon Sep 17 00:00:00 2001 From: thinkerou Date: Mon, 17 Sep 2018 23:07:34 +0800 Subject: [PATCH 1/3] test vgo --- .travis.yml | 4 ++++ Makefile | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) 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: From 6bba70a9190d78abea7b9375074ffd177d105492 Mon Sep 17 00:00:00 2001 From: thinkerou Date: Mon, 17 Sep 2018 23:18:01 +0800 Subject: [PATCH 2/3] update vgo test --- Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 726a161c..47a4475d 100644 --- a/Makefile +++ b/Makefile @@ -32,14 +32,12 @@ vet: deps: @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 + @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 embedmd: From 3e2eb782d59bb5abc58528b529df506ffc467bbb Mon Sep 17 00:00:00 2001 From: thinkerou Date: Tue, 18 Sep 2018 09:20:11 +0800 Subject: [PATCH 3/3] update vgo test --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 47a4475d..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,11 +34,10 @@ vet: go vet $(VETPACKAGES) deps: - @hash go help mod > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go mod download; \ - fi - @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; \