Fix PG & Travis drop/create database

This commit is contained in:
Jeremy Benoist 2018-12-05 14:29:46 +01:00
parent 842af5c357
commit 6df8b9c6a9
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 13 additions and 5 deletions

View file

@ -13,5 +13,5 @@ insert_final_newline = true
indent_style = space
indent_size = 2
[Makefile]
[*akefile]
indent_style = tab

View file

@ -51,15 +51,17 @@ install:
before_script:
- PHP=$TRAVIS_PHP_VERSION
- if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
# xdebug isn't enable for PHP 7.1
- if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- phpenv config-rm xdebug.ini || echo "xdebug not available"
- composer self-update --no-progress
script:
- travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
- echo "travis_fold:start:prepare"
- make prepare DB=$DB
# 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;
- echo "travis_fold:end:prepare"
- make fixtures

View file

@ -25,6 +25,12 @@ 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