From: Thomas Citharel Date: Sat, 29 Apr 2017 18:27:36 +0000 (+0200) Subject: fix travis X-Git-Tag: 2.3.0~31^2~104^2~8 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=42a2139b8f5cdda5bd0d79cb808b4ff414e95a5b;hp=17cc3aacb7c059c12eaadf35f53a97e5b8c19b93;p=github%2Fwallabag%2Fwallabag.git fix travis --- diff --git a/.travis.yml b/.travis.yml index 8d900d27..dea3da4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ cache: - vendor - $HOME/.composer/cache - node_modules - - $HOME/.cache/bower - $HOME/.npm php: @@ -59,9 +58,9 @@ before_script: - 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; + - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi; + - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi; + - if [[ $ASSETS = build ]]; then yarn install; fi; before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;