Revert PG on Travis about drop/create the database

This commit is contained in:
Jeremy Benoist 2019-01-23 13:47:51 +01:00
parent c416ed485f
commit 7485a272ff
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 1 additions and 9 deletions

View file

@ -59,9 +59,7 @@ script:
- travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
- echo "travis_fold:start:prepare"
# custom "prepare" for PG because the database should be created with a different user (see "before_script")
- if [[ ! $DB = pgsql ]]; then make prepare DB=$DB; fi;
- if [[ $DB = pgsql ]]; then make prepare-travis-pg DB=$DB; fi;
- make prepare DB=$DB
- echo "travis_fold:end:prepare"
- make fixtures

View file

@ -25,12 +25,6 @@ run: ## Run the wallabag built-in server
build: ## Run webpack
@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