From e2d488182dbe83562d76830a23d05e7dfc3c07df Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Mon, 26 Oct 2015 15:00:15 +0000 Subject: [PATCH] JS test dirs are now inlined --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a0d06b71c..56ca020c7 100644 --- a/Makefile +++ b/Makefile @@ -65,13 +65,13 @@ static: client/build/app.js esc -o app/static.go -prefix client/build client/build ifeq ($(BUILD_IN_CONTAINER),true) -client/build/app.js: client/app/scripts/* +client/build/app.js: $(shell find client/app/scripts -type f) mkdir -p client/build $(SUDO) docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \ -v $(shell pwd)/client/build:/home/weave/build \ $(SCOPE_UI_BUILD_IMAGE) npm run build -client-test: client/test/* +client-test: $(shell find client/app/scripts -type f) $(SUDO) docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \ -v $(shell pwd)/client/test:/home/weave/test \ $(SCOPE_UI_BUILD_IMAGE) npm test