X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=7a7c9056c6f105231fc4f6571999b001bb4a5b19;hb=488a468e3e11ff0ab6284afe232bf0f7fa68a8eb;hp=3c97a9da46d15cff826e68c4b8353608ed931d42;hpb=1a93ee423b072ec3bcb0c437cbf9b488bdea245c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index 3c97a9da..7a7c9056 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,12 @@ language: php
 # faster builds on docker-container setup
 sudo: false
 
+# used for HHVM
+addons:
+  apt:
+    packages:
+      - tidy
+
 # cache vendor dirs
 cache:
     directories:
@@ -10,36 +16,44 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 5.4
     - 5.5
     - 5.6
+    - 7.0
     - hhvm
-    - nightly
+
+env:
+  - DB=mysql
+  - DB=pgsql
+  - DB=sqlite
 
 matrix:
     fast_finish: true
+    exclude:
+        - php: hhvm
+          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
     allow_failures:
         - php: hhvm
-        - php: nightly
 
 branches:
     only:
         - v2
 
-install:
-    - composer self-update
-
-# build coverage only on one build, to speed up results feedbacks
 before_script:
-    - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
+    - composer self-update
+    - 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:
-    - ant prepare
-    - phpunit --exclude-group command-doctrine $PHPUNIT_FLAGS
-
-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
+    - 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