From 52f0f42aa5f5802c2c03a755459f0d03f9e016b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 3 Dec 2017 14:28:27 -0800 Subject: [PATCH] Split test and lint make targets, add a target for generating fake binary assets --- Makefile | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4aea27c62..be540bd2f 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ endif touch $@ .build/npm.install: package.json package-lock.json + @mkdir -p .build npm install touch $@ @@ -89,16 +90,40 @@ run-docker: docker-image -p $(PORT):$(PORT) \ $(NAME):$(VERSION) -.PHONY: lint -lint: .build/deps.ok +.PHONY: lint-go +lint-go: .build/golint golint ./... | (egrep -v "^vendor/|^bindata_assetfs.go" || true) + +.PHONY: lint-js +lint-js: .build/npm.install $(CURDIR)/node_modules/.bin/eslint --quiet assets/static/*.js -.PHONY: test -test: lint bindata_assetfs.go +.PHONY: lint +lint: lint-go lint-js + +# Creates mock bindata_assetfs.go with source assets rather than webpack generated ones +.PHONY: mock-assets +mock-assets: .build/deps.ok .build/vendor.ok + cp $(CURDIR)/assets/static/*.* $(CURDIR)/assets/static/dist/ + mkdir -p $(CURDIR)/assets/static/dist/templates + touch $(CURDIR)/assets/static/dist/templates/loader_unsee.html + touch $(CURDIR)/assets/static/dist/templates/loader_shared.html + touch $(CURDIR)/assets/static/dist/templates/loader_help.html + go-bindata-assetfs -prefix assets -nometadata assets/templates/... assets/static/dist/... + # force assets rebuild on next make run + rm -f .build/bindata_assetfs.* + +.PHONY: test-go +test-go: .build/vendor.ok go test -bench=. -cover `go list ./... | grep -v /vendor/` + +.PHONY: test-js +test-js: npm test +.PHONY: test +test: lint test-go test-js + .build/dep.ok: go get -u github.com/golang/dep/cmd/dep @mkdir -p .build @@ -114,7 +139,6 @@ vendor: .build/dep.ok dep ensure dep prune - .PHONY: vendor-update vendor-update: .build/dep.ok dep ensure -update