aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-05-09 11:43:48 +0200
committerGitHub <noreply@github.com>2017-05-09 11:43:48 +0200
commitb28c5430efefa63d04d87404c99798e82d0427e4 (patch)
tree0bf158fb56120be6624fa26639a28beb84a6598e /.travis.yml
parent43f81a62e93fb20c7af619a5132276706e989c62 (diff)
parentefac66cb56d650b863b64c9c4582589da6a2442a (diff)
downloadwallabag-b28c5430efefa63d04d87404c99798e82d0427e4.tar.gz
wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.tar.zst
wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.zip
Merge pull request #3022 from wallabag/webpack
Adds Webpack support and remove Grunt
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 77872f49..d7c28388 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;
@@ -74,4 +73,4 @@ script:
74 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 73 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
75 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi; 74 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
76 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi; 75 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
77 - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi; 76 - if [[ $ASSETS = build ]]; then yarn run build:prod; fi;