X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=2dd98bc0c8bcc6a363fa88ac1e3be841ebda5300;hb=97781ee967e94281a22f58a663ff1a3b4a47ee7b;hp=e2bf90cab5be8a83772a2d51c5a66d5dafe783e5;hpb=4cb3ef5125599c2ffdb3745e973e713cc0d6b5dd;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index e2bf90ca..2dd98bc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,13 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - nightly
     - hhvm
 
 env:
-  - DB=mysql
-  - DB=pgsql
-  - DB=sqlite
+    - DB=mysql
+    - DB=pgsql
+    - DB=sqlite
 
 matrix:
     fast_finish: true
@@ -41,8 +42,7 @@ matrix:
 # exclude v1 branches
 branches:
     except:
-        - master
-        - dev
+        - legacy
 
 before_script:
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
@@ -54,8 +54,8 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
-    - bin/phpunit -v
+    - phpunit -v
     - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
-    - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations ; fi;
+    - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;