Merge pull request #4438 from wallabag/dependabot/composer/scheb/two-factor-bundle...

[github/wallabag/wallabag.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index d8c16202848e091db22d4e65409125e443db0692..d0894dbbf85c9637120e47e0a4d22ae3f1db0f9a 100755 (executable)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,7 +2,14 @@ SHELL=bash
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 
-ENV ?= prod
+# ensure the ENV variable is well defined
+AVAILABLE_ENV := prod dev test
+ifneq ($(filter $(ENV),$(AVAILABLE_ENV)),)
+       # all good
+else
+       # not good, force it to "prod"
+       override ENV = prod
+endif
 
 help: ## Display this help menu
        @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -16,21 +23,17 @@ install: ## Install wallabag with the latest version
 update: ## Update the wallabag installation to the latest version
        @./scripts/update.sh $(ENV)
 
-dev: ## Install the latest dev version
+dev: ENV=dev
+dev: build ## Install the latest dev version
        @./scripts/dev.sh
 
 run: ## Run the wallabag built-in server
        @php bin/console server:run --env=dev
 
 build: ## Run webpack
+       @npm install
        @npm run build:$(ENV)
 
-prepare-travis-pg: ## Custom prepare for Travis & Postgres (do not drop/create the database)
-ifdef DB
-       cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-       php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
 prepare: clean ## Prepare database for testsuite
 ifdef DB
        cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml