X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=9ae43639743a7b8b971d4b798d62083eb0907557;hb=eb79e1cc102c1d9020335440194c64ed6691e57d;hp=9a19be6174dd195894dad5de4f120b0a4cfcb4a5;hpb=8a493541fa4911233fe9186e88371d17cb9fd7db;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index 9a19be61..9ae43639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
@@ -33,7 +32,6 @@ matrix:
         - php: hhvm
           env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
     allow_failures:
-        - php: 7.0
         - php: hhvm
 
 branches:
@@ -41,21 +39,13 @@ branches:
         - v2
 
 before_script:
-    - composer self-update
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
+    - composer self-update --no-progress
     - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-    # disable xdebug since we don't use code-coverage for now
-    - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
-    # build coverage only on one build, to speed up results feedbacks
-    # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
     - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
 
 script:
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
-    - SYMFONY_DEPRECATIONS_HELPER=weak bin/phpunit -v
-
-# after_script:
-    # - |
-        # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
-            # wget https://scrutinizer-ci.com/ocular.phar
-            # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-        # fi
+    - bin/phpunit -v