mirror of https://github.com/status-im/consul.git
Merge pull request #2437 from hashicorp/f-travis-pr-lite
Only builds the binary stuff under master branch CI.
This commit is contained in:
commit
b72840ae4c
|
@ -7,8 +7,7 @@ branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
install: make
|
|
||||||
script:
|
script:
|
||||||
- make test
|
- make ci
|
||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
12
GNUmakefile
12
GNUmakefile
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue