diff options
| author | Piwik Automation <hello@piwik.org> | 2015-03-25 12:11:33 +0300 |
|---|---|---|
| committer | Piwik Automation <hello@piwik.org> | 2015-03-25 12:11:33 +0300 |
| commit | 76606e13d4d4cd8e2fc9b8ea2edcf2fb64ef86b3 (patch) | |
| tree | 590c5693b6aadc69e0d5c5ae76091364d6d11dbb /.travis.yml | |
| parent | ce32419c7c6416062ac8cc45d6920f125a35b91f (diff) | |
.travis.yml file is out of date, auto-updating .travis.yml file.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 551613da51..83038ac737 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,7 +118,7 @@ before_script: # travis now complains about this failing 9 times out of 10, so removing it. hopefully the random failures it prevented won't come back # - travis_retry composer self-update - - travis_retry composer install + - [ "$SKIP_COMPOSER_INSTALL" != "1" ] && travis_retry composer install # print out more debugging info - uname -a @@ -128,13 +128,7 @@ before_script: - mysql -e 'create database piwik_tests;' # Make sure we use Python 2.6 - - travis_retry sudo add-apt-repository ppa:fkrull/deadsnakes -y - - travis_retry sudo apt-get update > /dev/null - - travis_retry sudo apt-get install python2.6 python2.6-dev -y --force-yes > /dev/null - - # Log Analytics works with Python 2.6 or 2.7 but we want to test on 2.6 - - python2.6 --version - - python --version + - ./tests/travis/install_python_2.6.sh - ./tests/travis/prepare.sh - ./tests/travis/setup_webserver.sh |