X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=.travis.yml;h=f1334f5265ccdd27f8b2f5e4b4b7669b1459bcef;hb=57386125abc5c50c1438cf7e78d01f06021adc0a;hp=749b8ef73062f5f0c6c5d9b2b8e4b3f725ca95fb;hpb=40c47f7023577d410818569b3be953c4aa2604cc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index 749b8ef7..f1334f52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: php
 
+services:
+  - rabbitmq
+  - redis
+
 # faster builds on docker-container setup
 sudo: false
 
@@ -37,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
 
@@ -82,13 +64,15 @@ before_script:
 install:
     - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; 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 bash composer install -o  --no-interaction --no-progress --prefer-dist
     - ant prepare-$DB
-    - phpunit -v
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then 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 [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi;