From 2847943b2fe8e8d933c159cc10d9a361e0ea3e5b Mon Sep 17 00:00:00 2001 From: David Calavera Date: Mon, 8 Feb 2016 09:39:18 -0800 Subject: [PATCH] Move CI scripts to the Makefile. Signed-off-by: David Calavera --- .travis.yml | 12 +++--------- Makefile | 13 +++++++++++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5821541..ae1744f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,6 @@ email: false go: - 1.5 - install: - - go get -t ./... - - go get github.com/golang/lint/golint - before_script: - - go vet ./... - - test -z "$(golint ./... | tee /dev/stderr)" - - test -z "$(gofmt -s -l . | tee /dev/stderr)" - script: - - go test -v ./... + install: make deps + before_script: test -z "$(make validate | tee /dev/stderr)" + script: make test diff --git a/Makefile b/Makefile index d5743c8..7ca9899 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,19 @@ -.PHONY: all osxkeychain test +.PHONY: all deps osxkeychain test all: test +deps: + go get -t ./... + go get github.com/golang/lint/golint + osxkeychain: mkdir -p bin go build -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go test: - go test ./... + go test -v ./... + +validate: + go vet ./... + golint ./... + gofmt -s -l .