fix travis

This commit is contained in:
Thomas Citharel 2017-04-29 20:27:36 +02:00
parent 17cc3aacb7
commit 42a2139b8f

View File

@ -20,7 +20,6 @@ cache:
- vendor - vendor
- $HOME/.composer/cache - $HOME/.composer/cache
- node_modules - node_modules
- $HOME/.cache/bower
- $HOME/.npm - $HOME/.npm
php: php:
@ -59,9 +58,9 @@ before_script:
- 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: install:
- if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
- if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
- if [[ $ASSETS = build ]]; then npm install; fi; - if [[ $ASSETS = build ]]; then yarn install; fi;
before_install: before_install:
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;