diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..428d512 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,20 @@ +language: go + +env: + - ETCD_VER=v3.3.0 +before_install: + - curl -L https://github.com/coreos/etcd/releases/download/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz + - mkdir -p /tmp/etcd + - tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/etcd --strip-components=1 + - /tmp/etcd/etcd + --advertise-client-urls http://127.0.0.1:12379 + --listen-client-urls http://127.0.0.1:12379 > /dev/null & + +go: + - 1.11.2 + +install: + - make setup + +script: + - make diff --git a/Makefile b/Makefile index 258f15d..be54a7b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ .PHONY: all + all: build fmt vet lint test +default: build fmt vet lint test ALL_PACKAGES=$(shell go list ./... | grep -v "vendor") APP_EXECUTABLE="out/weaver" @@ -7,25 +9,25 @@ COMMIT_HASH=$(shell git rev-parse --verify head | cut -c-1-8) BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%S%z) setup: - go get -u github.com/golang/lint/golint + GO111MODULE=on go get -u github.com/golang/lint/golint compile: mkdir -p out/ - go build -o $(APP_EXECUTABLE) -ldflags "-X main.BuildDate=$(BUILD_DATE) -X main.Commit=$(COMMIT_HASH) -s -w" + GO111MODULE=on go build -o $(APP_EXECUTABLE) -ldflags "-X main.BuildDate=$(BUILD_DATE) -X main.Commit=$(COMMIT_HASH) -s -w" build: deps compile fmt vet lint deps: - go mod tidy -v + GO111MODULE=on go mod tidy -v install: - go install ./... + GO111MODULE=on go install ./... fmt: - go fmt ./... + GO111MODULE=on go fmt ./... vet: - go vet ./... + GO111MODULE=on go vet ./... lint: @if [[ `golint $(All_PACKAGES) | { grep -vwE "exported (var|function|method|type|const) \S+ should have comment" || true; } | wc -l | tr -d ' '` -ne 0 ]]; then \ @@ -34,14 +36,14 @@ lint: fi; test: copy-config - go test ./... + GO111MODULE=on go test ./... test-cover-html: @echo "mode: count" > coverage-all.out $(foreach pkg, $(ALL_PACKAGES),\ go test -coverprofile=coverage.out -covermode=count $(pkg);\ tail -n +2 coverage.out >> coverage-all.out;) - go tool cover -html=coverage-all.out -o out/coverage.html + GO111MODULE=on go tool cover -html=coverage-all.out -o out/coverage.html copy-config: cp weaver.conf.yaml.sample weaver.conf.yaml diff --git a/go.sum b/go.sum index ea0b3de..71849c7 100644 --- a/go.sum +++ b/go.sum @@ -142,7 +142,6 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -150,7 +149,6 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52 h1:JG/0uqcGdTNgq7FdU+61l5Pdmb8putNZlXb65bJBROs= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=