X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=0f4cbbe80ebaf8df588c4144309c1f856fa7cae6;hb=f5c862640bc4230699c18a5b0632cd1f587be739;hp=9e44edc6a1c1448f1d7dd8e617cacda0ca68a69d;hpb=d3d0defabc8224172b59c85db66c2d4e6bc3f06b;p=github%2Fwallabag%2Fwallabag.git diff --git a/Makefile b/Makefile index 9e44edc6..0f4cbbe8 100755 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ dev: ## Install the latest dev version @sh scripts/dev.sh run: ## Run the wallabag built-in server - @php bin/console server:run --env=$(ENV) + @php bin/console server:run --env=dev build: ## Run webpack @npm run build:$(ENV) @@ -30,18 +30,7 @@ ifdef DB endif -php bin/console doctrine:database:drop --force --env=test php bin/console doctrine:database:create --env=test -ifndef DB ## make test does not define DB - php bin/console doctrine:schema:create --env=test -endif -ifeq ($(DB), sqlite) - php bin/console doctrine:schema:create --env=test -endif -ifeq ($(DB), mysql) - php bin/console doctrine:database:import data/sql/mysql_base.sql --env=test -endif -ifeq ($(DB), pgsql) - psql -h localhost -d wallabag_test -U travis -f data/sql/pgsql_base.sql -endif + php bin/console doctrine:migrations:migrate --no-interaction --env=test fixtures: ## Load fixtures into database php bin/console doctrine:fixtures:load --no-interaction --env=test