diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-09-04 09:19:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-04 09:19:20 +0200 |
commit | 3f6700fd6cbffff733df00c562476223d286c72a (patch) | |
tree | 4338093515fe9bc91ff6a338866f84fae1a11514 | |
parent | 33b75b3b51ea2ca37d6859bd5c50612f110c4621 (diff) | |
parent | b1574a39877d69cdf54111b0fb108039c21eae5f (diff) | |
download | wallabag-3f6700fd6cbffff733df00c562476223d286c72a.tar.gz wallabag-3f6700fd6cbffff733df00c562476223d286c72a.tar.zst wallabag-3f6700fd6cbffff733df00c562476223d286c72a.zip |
Merge pull request #4105 from shtrom/dev-build
Make dev depend on build
-rwxr-xr-x | GNUmakefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index a04468cb..15d737db 100755 --- a/GNUmakefile +++ b/GNUmakefile | |||
@@ -16,13 +16,15 @@ install: ## Install wallabag with the latest version | |||
16 | update: ## Update the wallabag installation to the latest version | 16 | update: ## Update the wallabag installation to the latest version |
17 | @./scripts/update.sh $(ENV) | 17 | @./scripts/update.sh $(ENV) |
18 | 18 | ||
19 | dev: ## Install the latest dev version | 19 | dev: ENV=dev |
20 | dev: build ## Install the latest dev version | ||
20 | @./scripts/dev.sh | 21 | @./scripts/dev.sh |
21 | 22 | ||
22 | run: ## Run the wallabag built-in server | 23 | run: ## Run the wallabag built-in server |
23 | @php bin/console server:run --env=dev | 24 | @php bin/console server:run --env=dev |
24 | 25 | ||
25 | build: ## Run webpack | 26 | build: ## Run webpack |
27 | @npm install | ||
26 | @npm run build:$(ENV) | 28 | @npm run build:$(ENV) |
27 | 29 | ||
28 | prepare: clean ## Prepare database for testsuite | 30 | prepare: clean ## Prepare database for testsuite |