aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-04 10:25:49 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-04 10:31:03 +0200
commitf440e282819a1e92e3200cf2e588fc9a0c1278ac (patch)
tree7769cfd595aaba70945f7a4a50ef1f42b6f12528 /.travis.yml
parentca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a (diff)
downloadwallabag-f440e282819a1e92e3200cf2e588fc9a0c1278ac.tar.gz
wallabag-f440e282819a1e92e3200cf2e588fc9a0c1278ac.tar.zst
wallabag-f440e282819a1e92e3200cf2e588fc9a0c1278ac.zip
Update doc
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 821ae48f..28f068b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,9 +61,7 @@ matrix:
61 group: edge 61 group: edge
62 env: DB=sqlite 62 env: DB=sqlite
63 - php: 7.0 63 - php: 7.0
64 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite 64 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
65 - php: 7.0
66 env: DB=sqlite ASSETS=build
67 allow_failures: 65 allow_failures:
68 - php: hhvm-3.12 66 - php: hhvm-3.12
69 - php: 7.1 67 - php: 7.1
@@ -94,7 +92,7 @@ before_install:
94script: 92script:
95 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist 93 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
96 - ant prepare-$DB 94 - ant prepare-$DB
97 - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi; 95 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
98 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; 96 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
99 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 97 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
100 - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi; 98 - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi;