aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rwxr-xr-xGNUmakefile6
2 files changed, 1 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index c660bb5e..393d0033 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,9 +59,7 @@ script:
59 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist 59 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
60 60
61 - echo "travis_fold:start:prepare" 61 - echo "travis_fold:start:prepare"
62 # custom "prepare" for PG because the database should be created with a different user (see "before_script") 62 - make prepare DB=$DB
63 - if [[ ! $DB = pgsql ]]; then make prepare DB=$DB; fi;
64 - if [[ $DB = pgsql ]]; then make prepare-travis-pg DB=$DB; fi;
65 - echo "travis_fold:end:prepare" 63 - echo "travis_fold:end:prepare"
66 64
67 - make fixtures 65 - make fixtures
diff --git a/GNUmakefile b/GNUmakefile
index d8c16202..a04468cb 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,12 +25,6 @@ run: ## Run the wallabag built-in server
25build: ## Run webpack 25build: ## Run webpack
26 @npm run build:$(ENV) 26 @npm run build:$(ENV)
27 27
28prepare-travis-pg: ## Custom prepare for Travis & Postgres (do not drop/create the database)
29ifdef DB
30 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
31endif
32 php bin/console doctrine:migrations:migrate --no-interaction --env=test
33
34prepare: clean ## Prepare database for testsuite 28prepare: clean ## Prepare database for testsuite
35ifdef DB 29ifdef DB
36 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml 30 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml