X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=5b5b18087f500c7d0ae6218ad1792e52a3ace7b1;hb=b502d6ad0964267b49f91eafb3bed8a4693aba0f;hp=d7c28388914c6af880d9d016150c9bb5158b2a0b;hpb=54c2d164a362e64a320438b439bf9dd6d2c02424;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index d7c28388..5b5b1808 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,17 @@
 language: php
 
 services:
-  - rabbitmq
-  - redis
+    - rabbitmq
+    - redis
 
 # faster builds on docker-container setup
 sudo: false
 
 # used for HHVM
 addons:
-  apt:
-    packages:
-      - tidy
+    apt:
+        packages:
+            - tidy
 
 # cache vendor dirs
 cache:
@@ -21,11 +21,11 @@ cache:
         - $HOME/.composer/cache
         - node_modules
         - $HOME/.npm
+        - $HOME/.yarn-cache
 
 php:
-    - 5.6
-    - 7.0
     - 7.1
+    - 7.2
     - nightly
 
 node_js:
@@ -39,7 +39,7 @@ env:
 matrix:
     fast_finish: true
     include:
-        - php: 7.0
+        - php: 7.2
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
         - php: nightly
@@ -66,10 +66,16 @@ 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
+    - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
+
+    - echo "travis_fold:start:prepare"
+    - make prepare DB=$DB
+    - echo "travis_fold:end:prepare"
+
+    - make 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;