luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

build: use vendorfmt to make vendor.json more merge friendly

This commit is contained in:
Frank Schroeder 2017-07-18 06:46:25 +02:00 committed by Frank Schröder
parent 525362d614
commit 94a09b4434
2 changed files with 195 additions and 1156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -2,6 +2,7 @@ SHELL = bash
GOTOOLS = \
github.com/elazarl/go-bindata-assetfs/... \
github.com/jteeuwen/go-bindata/... \
github.com/magiconair/vendorfmt/cmd/vendorfmt \
github.com/mitchellh/gox \
golang.org/x/tools/cmd/cover \
golang.org/x/tools/cmd/stringer \
@ -31,6 +32,7 @@ bin: tools
# dev creates binaries for testing locally - these are put into ./bin and $GOPATH
dev:
vendorfmt
mkdir -p pkg/$(GOOS)_$(GOARCH)/ bin/
go install -ldflags '$(GOLDFLAGS)' -tags '$(GOTAGS)'
cp $(GOPATH)/bin/consul bin/

1347
vendor/vendor.json vendored
View File

File diff suppressed because it is too large Load Diff