X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=365cc881369cc2ddedb88916dae6f731d114cab2;hb=0e62de99f0e8aca16572c4eb3074859c8de434c8;hp=c5fe7b01d03f9315db2798e28e28dfa667ce6d31;hpb=114c55c0a6eade2ba6c53fe25f61cc58cca91620;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index c5fe7b01..365cc881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,31 +41,9 @@ env:
 matrix:
     fast_finish: true
     include:
-        # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
-        - php: hhvm-3.12
-          sudo: required
-          dist: trusty
-          group: edge
-          env: DB=mysql
-          addons:
-            apt:
-                packages:
-                    - mysql-server-5.6
-                    - mysql-client-core-5.6
-                    - mysql-client-5.6
-          services:
-            - mysql
-        - php: hhvm-3.12
-          sudo: required
-          dist: trusty
-          group: edge
-          env: DB=sqlite
         - php: 7.0
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
-        - php: 7.0
-          env: DB=sqlite ASSETS=build
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
-        - php: hhvm-3.12
         - php: 7.1
         - php: nightly
 
@@ -79,20 +57,23 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
     # xdebug isn't enable for PHP 7.1
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
-    - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
     - composer self-update --no-progress
     - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 
 install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
+    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi;
     - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
+    - if [[ $ASSETS = build ]]; then npm install; fi;
 
 before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait bash install.sh
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
-    - phpunit -v
+    - 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 [[ $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;
+    - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi;