X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=a8f6a74416b3ea09cec36717d810b098e8380803;hb=4b5e95c0e52d0627f33cae7cb5f486a53561f5c0;hp=28f068b969f226d313eb8acf7928ce13d5ed00de;hpb=f440e282819a1e92e3200cf2e588fc9a0c1278ac;p=github%2Fwallabag%2Fwallabag.git diff --git a/.travis.yml b/.travis.yml index 28f068b9..a8f6a744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,29 +41,9 @@ env: matrix: fast_finish: true include: - # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - env: DB=mysql - addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 - services: - - mysql - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - env: DB=sqlite - php: 7.0 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite allow_failures: - - php: hhvm-3.12 - php: 7.1 - php: nightly @@ -82,7 +62,7 @@ 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 5.0; fi; + - 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; @@ -95,4 +75,6 @@ script: - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi; - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; - - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi; + - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi; + - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/FOSUserBundle/translations -v ; fi; + - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi;