diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
| commit | bc4c240385d51b91419f3484819dfc7e35eaf261 (patch) | |
| tree | 6f685c84b68475cf29b497d3b28872b89e0e435b /.travis.yml | |
| parent | 0d37b7f1de8a5e5eedc29a5b0c9091bb24217173 (diff) | |
| parent | 715cff5e3e0affc9c250eaacbcd5bc05308f4bc0 (diff) | |
Merge branch 'master' into report_and_dimension_refactoring
Conflicts:
core/FrontController.php
core/Log.php
plugins/API/API.php
tests/PHPUnit/Fixture.php
tests/PHPUnit/UI
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 40a749e108..4eb7e54bec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,9 +94,9 @@ before_script: - php -r "var_dump(gd_info());" - mysql -e 'create database piwik_tests;' # Make sure we use Python 2.6 - - sudo add-apt-repository ppa:fkrull/deadsnakes -y - - sudo apt-get update - - sudo apt-get install python2.6 python2.6-dev + - travis_retry sudo add-apt-repository ppa:fkrull/deadsnakes -y + - travis_retry sudo apt-get update + - travis_retry sudo apt-get install python2.6 python2.6-dev # Log Analytics works with Python 2.6 or 2.7 but we want to test on 2.6 - python2.6 --version - python --version @@ -112,6 +112,7 @@ after_script: - cat /var/log/nginx/error.log - cat $TRAVIS_BUILD_DIR/tmp/php-fpm.log - cat $TRAVIS_BUILD_DIR/tmp/logs/piwik.log + - cat $TRAVIS_BUILD_DIR/config/config.ini.php - cd $TRAVIS_BUILD_DIR - ./tests/travis/upload_artifacts.sh |