aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-04-29 20:27:36 +0200
committerThomas Citharel <tcit@tcit.fr>2017-05-04 14:49:44 +0200
commit42a2139b8f5cdda5bd0d79cb808b4ff414e95a5b (patch)
tree4e10a96e3c84d87588d7053fbbb90385df7c99e6
parent17cc3aacb7c059c12eaadf35f53a97e5b8c19b93 (diff)
downloadwallabag-42a2139b8f5cdda5bd0d79cb808b4ff414e95a5b.tar.gz
wallabag-42a2139b8f5cdda5bd0d79cb808b4ff414e95a5b.tar.zst
wallabag-42a2139b8f5cdda5bd0d79cb808b4ff414e95a5b.zip
fix travis
-rw-r--r--.travis.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 8d900d27..dea3da4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,6 @@ cache:
20 - vendor 20 - vendor
21 - $HOME/.composer/cache 21 - $HOME/.composer/cache
22 - node_modules 22 - node_modules
23 - $HOME/.cache/bower
24 - $HOME/.npm 23 - $HOME/.npm
25 24
26php: 25php:
@@ -59,9 +58,9 @@ before_script:
59 - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; 58 - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
60 59
61install: 60install:
62 - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; 61 - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
63 - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; 62 - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
64 - if [[ $ASSETS = build ]]; then npm install; fi; 63 - if [[ $ASSETS = build ]]; then yarn install; fi;
65 64
66before_install: 65before_install:
67 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; 66 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;