aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-21 11:02:18 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-21 11:02:18 +0100
commite72a943ad244f8b6349e31eb9a148808045b224b (patch)
tree88784684576db7a2acba60530cc1843360ddabe7 /.travis.yml
parenteff6a406f3eb67063ee8db660bb85c80472c7d95 (diff)
parent3ee1582e60cbebb70f6e4b932e337a59a8517580 (diff)
downloadwallabag-e72a943ad244f8b6349e31eb9a148808045b224b.tar.gz
wallabag-e72a943ad244f8b6349e31eb9a148808045b224b.tar.zst
wallabag-e72a943ad244f8b6349e31eb9a148808045b224b.zip
Merge pull request #1610 from wallabag/v2-composer-lock-release
Disable xdebug all the time
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 07d66f88..9ae43639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,12 +39,13 @@ branches:
39 - v2 39 - v2
40 40
41before_script: 41before_script:
42 - composer self-update 42 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
43 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
44 - composer self-update --no-progress
43 - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; 45 - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
44 # disable xdebug since we don't use code-coverage for now
45 - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
46 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; 46 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
47 47
48script: 48script:
49 - travis_wait composer update --no-interaction --no-progress
49 - ant prepare-$DB 50 - ant prepare-$DB
50 - bin/phpunit -v 51 - bin/phpunit -v