Merge pull request #2353 from wallabag/assets-fix

Basically, fix everything

1 files changed, 4 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 4170ff04..f1334f52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,9 +42,7 @@ matrix:
     fast_finish: true
     include:
         - 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: 7.1
         - php: nightly
@@ -66,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_dev.sh
+    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
     - ant prepare-$DB
     - 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;