X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=365cc881369cc2ddedb88916dae6f731d114cab2;hb=92995138fb84be1a54201b7a2af7ce5a12946fa1;hp=73f9491ab62d6922eb75c83a8b29db7a88a6448f;hpb=fc41abb990b835ec9449d691a14d0b88579db865;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index 73f9491a..365cc881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: php
 
+services:
+  - rabbitmq
+  - redis
+
 # faster builds on docker-container setup
 sudo: false
 
@@ -15,6 +19,9 @@ cache:
     directories:
         - vendor
         - $HOME/.composer/cache
+        - node_modules
+        - $HOME/.cache/bower
+        - $HOME/.npm
 
 php:
     - 5.5
@@ -23,6 +30,9 @@ php:
     - 7.1
     - nightly
 
+node_js:
+    - "5"
+
 env:
     - DB=mysql
     - DB=pgsql
@@ -31,29 +41,10 @@ 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
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
-        - php: hhvm-3.12
+        - php: 7.1
         - php: nightly
 
 # exclude v1 branches
@@ -67,14 +58,22 @@ before_script:
     # xdebug isn't enable for PHP 7.1
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - composer self-update --no-progress
-    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
+    - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
+
+install:
+    - 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 composer install --no-interaction --no-progress --prefer-dist -o
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
-    - 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 -v ; fi;
+    - 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;