Merge pull request #2437 from hashicorp/f-travis-pr-lite

Only builds the binary stuff under master branch CI.
This commit is contained in:
James Phillips 2016-10-25 13:58:35 -07:00 committed by GitHub
commit b72840ae4c
2 changed files with 11 additions and 4 deletions

View File

@ -7,8 +7,7 @@ branches:
only: only:
- master - master
install: make
script: script:
- make test - make ci
sudo: false sudo: false

View File

@ -10,7 +10,15 @@ VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
VERSION?=$(shell awk -F\" '/^const Version/ { print $$2; exit }' version.go) VERSION?=$(shell awk -F\" '/^const Version/ { print $$2; exit }' version.go)
# all builds binaries for all targets # all builds binaries for all targets
all: tools all: bin
ci:
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then \
$(MAKE) bin ;\
fi
@$(MAKE) test
bin: tools
@mkdir -p bin/ @mkdir -p bin/
@sh -c "'$(CURDIR)/scripts/build.sh'" @sh -c "'$(CURDIR)/scripts/build.sh'"
@ -61,4 +69,4 @@ static-assets:
tools: tools:
go get -u -v $(GOTOOLS) go get -u -v $(GOTOOLS)
.PHONY: all bin dev dist cov test cover format vet static-assets tools .PHONY: all ci bin dev dist cov test cover format vet static-assets tools