X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=ffbe102a045c05f09ca3201322592e3ff153a111;hb=bb86dc648660cf3d94c6800f97214426b52f2d8e;hp=83c5f37ad78610d12e49211d3f6c0fc1b8bb752f;hpb=f3b637fbfee2fa9f66e53cbadd05e85771eece9d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/Makefile b/Makefile
index 83c5f37a..ffbe102a 100755
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,11 @@ dev: ## Install the latest dev version
 run: ## Run the wallabag built-in server
 	@php bin/console server:run --env=$(ENV)
 
-build: ## Run grunt
-	@grunt
+build: ## Run webpack
+	@npm run build:$(ENV)
 
 test: ## Launch wallabag testsuite
-	@if [ ! -d "vendor/phpunit" ]; then composer install; fi
-	@ant prepare && vendor/phpunit/phpunit/phpunit -v
+	@ant prepare && bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION