diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-12-05 14:29:46 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-23 13:28:24 +0100 |
commit | 6df8b9c6a90de333c9e24a49615fffa9e350e382 (patch) | |
tree | 21a855182606852214e74583ec6c8e6289cc75c7 /.travis.yml | |
parent | 842af5c3571c5318ae4e1c81dc52457fbf6d3f21 (diff) | |
download | wallabag-6df8b9c6a90de333c9e24a49615fffa9e350e382.tar.gz wallabag-6df8b9c6a90de333c9e24a49615fffa9e350e382.tar.zst wallabag-6df8b9c6a90de333c9e24a49615fffa9e350e382.zip |
Fix PG & Travis drop/create database
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 0ca1e192..c660bb5e 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -51,15 +51,17 @@ install: | |||
51 | 51 | ||
52 | before_script: | 52 | before_script: |
53 | - PHP=$TRAVIS_PHP_VERSION | 53 | - PHP=$TRAVIS_PHP_VERSION |
54 | - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 54 | - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini |
55 | # xdebug isn't enable for PHP 7.1 | 55 | - phpenv config-rm xdebug.ini || echo "xdebug not available" |
56 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | ||
57 | - composer self-update --no-progress | 56 | - composer self-update --no-progress |
58 | 57 | ||
59 | script: | 58 | script: |
60 | - 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 | |||
61 | - echo "travis_fold:start:prepare" | 61 | - echo "travis_fold:start:prepare" |
62 | - make prepare DB=$DB | 62 | # custom "prepare" for PG because the database should be created with a different user (see "before_script") |
63 | - if [[ ! $DB = pgsql ]]; then make prepare DB=$DB; fi; | ||
64 | - if [[ $DB = pgsql ]]; then make prepare-travis-pg DB=$DB; fi; | ||
63 | - echo "travis_fold:end:prepare" | 65 | - echo "travis_fold:end:prepare" |
64 | 66 | ||
65 | - make fixtures | 67 | - make fixtures |