From 4aa187674c970f4809b818a00d2a46fbb380afa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 4 Aug 2017 18:17:09 -0700 Subject: [PATCH] Call vendor make target when building binary This will ensure vendor dir is populated --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c9609cab6..9a37345e8 100644 --- a/Makefile +++ b/Makefile @@ -49,11 +49,11 @@ endif rm -f .build/bindata_assetfs.* touch $@ -bindata_assetfs.go: .build/deps.ok .build/bindata_assetfs.$(GO_BINDATA_MODE) $(ASSET_SOURCES) webpack.config.js +bindata_assetfs.go: .build/deps.ok .build/bindata_assetfs.$(GO_BINDATA_MODE) $(ASSET_SOURCES) webpack.config.js .build/vendor.ok $(CURDIR)/node_modules/.bin/webpack -p go-bindata-assetfs $(GO_BINDATA_FLAGS) -prefix assets -nometadata assets/templates/... assets/static/dist/... -$(NAME): .build/deps.ok bindata_assetfs.go $(SOURCES) +$(NAME): .build/deps.ok .build/vendor.ok bindata_assetfs.go $(SOURCES) go build -ldflags "-X main.version=$(VERSION)" .PHONY: clean @@ -104,6 +104,11 @@ test: lint bindata_assetfs.go @mkdir -p .build touch $@ +.build/vendor.ok: Gopkg.lock Gopkg.toml .build/dep.ok + dep ensure + dep prune + touch $@ + .PHONY: vendor vendor: .build/dep.ok dep ensure