aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-08-05 19:19:09 +0200
committerGitHub <noreply@github.com>2017-08-05 19:19:09 +0200
commitfccc3a2e076c84a7b4b775cbfe4e69c8c6975b0a (patch)
treefc0839c30e536b1f25bdbb83f956f6d6b53ac205 /Makefile
parent8b5bef48d5e5609c0c89a99f34fe56919125fa68 (diff)
parent5385fda8abe222effbe5a760902581dbf33165da (diff)
downloadwallabag-fccc3a2e076c84a7b4b775cbfe4e69c8c6975b0a.tar.gz
wallabag-fccc3a2e076c84a7b4b775cbfe4e69c8c6975b0a.tar.zst
wallabag-fccc3a2e076c84a7b4b775cbfe4e69c8c6975b0a.zip
Merge pull request #3311 from nclsHart/makefile-webpack
Fix make build by replacing grunt with webpack
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b3335261..ffbe102a 100755
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ dev: ## Install the latest dev version
23run: ## Run the wallabag built-in server 23run: ## Run the wallabag built-in server
24 @php bin/console server:run --env=$(ENV) 24 @php bin/console server:run --env=$(ENV)
25 25
26build: ## Run grunt 26build: ## Run webpack
27 @grunt 27 @npm run build:$(ENV)
28 28
29test: ## Launch wallabag testsuite 29test: ## Launch wallabag testsuite
30 @ant prepare && bin/simple-phpunit -v 30 @ant prepare && bin/simple-phpunit -v