diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-12-15 22:18:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-15 22:18:45 +0100 |
commit | 24becc9717423748e6ef06c6cf1c499435af66b9 (patch) | |
tree | 9d6feb77e78d8318ebccc807356ff2d414892486 /.travis.yml | |
parent | 15cc1838501955638f3ac6e0fb3235bb6ac4e26c (diff) | |
parent | 6ad8aabb83581fdc978d0cea81be8e776a3b7198 (diff) | |
download | wallabag-24becc9717423748e6ef06c6cf1c499435af66b9.tar.gz wallabag-24becc9717423748e6ef06c6cf1c499435af66b9.tar.zst wallabag-24becc9717423748e6ef06c6cf1c499435af66b9.zip |
Merge pull request #2667 from wallabag/upgrade-symfony-32
Upgrade to Symfony 3.2
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index bffa0704..8c8093bf 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -57,7 +57,6 @@ before_script: | |||
57 | - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 57 | - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; |
58 | # xdebug isn't enable for PHP 7.1 | 58 | # xdebug isn't enable for PHP 7.1 |
59 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | 59 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi |
60 | - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; | ||
61 | - composer self-update --no-progress | 60 | - composer self-update --no-progress |
62 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | 61 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
63 | 62 | ||
@@ -72,7 +71,7 @@ before_install: | |||
72 | script: | 71 | script: |
73 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist | 72 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist |
74 | - ant prepare-$DB | 73 | - ant prepare-$DB |
75 | - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi; | 74 | - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi; |
76 | - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; | 75 | - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; |
77 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; | 76 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; |
78 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi; | 77 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi; |