X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=57b3aa53aff3876672d21304f6ec8475b9f15660;hb=58411a734ab61ccfc5e632ab3a22253ec4ffae0e;hp=e6cf96cb4ff2cb501e4838938b763a86650840a5;hpb=9d521dbfee3f59ea3f48c3ac03f8a307908c26ce;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index e6cf96cb..57b3aa53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
     - nightly
 
 node_js:
@@ -43,6 +44,7 @@ matrix:
         - php: 7.0
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
+        - php: 7.2
         - php: nightly
 
 # exclude v1 branches
@@ -67,19 +69,17 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
-    - ant prepare-$DB
-
-    - echo "travis_fold:start:migrations"
-    - php bin/console doctrine:migrations:migrate --no-interaction --env=test
-    - echo "travis_fold:end:migrations"
+    - travis_wait composer update --no-interaction --no-progress
+    - echo "travis_fold:start:prepare"
+    - make prepare DB=$DB
+    - echo "travis_fold:end:prepare"
 
     - echo "travis_fold:start:fixtures"
     - php bin/console doctrine:fixtures:load --no-interaction --env=test
     - echo "travis_fold:end:fixtures"
 
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
-    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
+    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;