X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=8c1ec5cb3d8ef2581701615943e3d739743175bb;hb=9c7997db8ee3a743a3d4e5955320af9a7d388a7b;hp=c660bb5e529d8f42dce6155b9fa9bc8191f0285f;hpb=6df8b9c6a90de333c9e24a49615fffa9e350e382;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index c660bb5e..8c1ec5cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,14 +54,16 @@ before_script:
     - 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
+    # install imagick
+    - pear config-set preferred_state beta
+    - pecl channel-update pecl.php.net
+    - yes | pecl install imagick
 
 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