mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-29 20:41:03 +00:00
Code Issues Projects Releases Wiki Activity

Revert PG on Travis about drop/create the database

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -59,9 +59,7 @@ script:
- travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
- echo "travis_fold:start:prepare" - echo "travis_fold:start:prepare"
# custom "prepare" for PG because the database should be created with a different user (see "before_script") - make prepare DB=$DB
- 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" - echo "travis_fold:end:prepare"
- make fixtures - make fixtures

6
GNUmakefile
View file

@ -25,12 +25,6 @@ run: ## Run the wallabag built-in server
build: ## Run webpack build: ## Run webpack
@npm run build:$(ENV) @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 prepare: clean ## Prepare database for testsuite
ifdef DB ifdef DB
cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml