X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=84740841088d91e8186a9a1c32e37a7c933afb8b;hb=b6a3e571b22c8090dc86e6e9def132270a1b88b6;hp=9973bcae64be4d3ebdea5abf29945aa6a19571c6;hpb=5759c9aac1f13f2776319c3f249acb4c97ea14d8;p=github%2Fwallabag%2Fwallabag.git diff --git a/.travis.yml b/.travis.yml index 9973bcae..84740841 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,31 +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 DB=sqlite - - php: 7.0 - env: DB=sqlite ASSETS=build + env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite allow_failures: - - php: hhvm-3.12 - php: 7.1 - php: nightly @@ -84,16 +62,19 @@ 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; before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist + - travis_wait bash composer update --no-interaction --no-progress - ant prepare-$DB - - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi; + - 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;