remove install scripts and tweak travis

[github/wallabag/wallabag.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b0b26b56eaf3ece129e61f4f51a04f6bcd694c38..9973bcae64be4d3ebdea5abf29945aa6a19571c6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,8 +91,9 @@ 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 [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; 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 ; fi;