diff options
| author | Piwik Automation <hello@piwik.org> | 2015-07-22 03:58:18 +0300 |
|---|---|---|
| committer | Piwik Automation <hello@piwik.org> | 2015-07-22 03:58:18 +0300 |
| commit | 76479a879ac6f342e4c1270f0e0c0ed578165850 (patch) | |
| tree | 3ffea64a0b28cb6e0c2f9ae9632d7ba43bdcb064 /.travis.yml | |
| parent | bd30530c294aae20e84d38e0ed297acfa802fd68 (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, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index c1082a45db..37a01b1547 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,16 +88,16 @@ before_install: - '[[ "$TRAVIS_PHP_VERSION" == 5.3* ]] && export USE_ZEND_ALLOC=0 || true' install: - - '[ ! -f ./tests/travis/install_mysql_5.6.sh ] || ./tests/travis/install_mysql_5.6.sh' - - # Make sure we use Python 2.6 - - '[ ! -f ./tests/travis/install_python_2.6.sh ] || ./tests/travis/install_python_2.6.sh' - - git fetch -q - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' + - '[ ! -f ./tests/travis/install_mysql_5.6.sh ] || ./tests/travis/install_mysql_5.6.sh' + + # Make sure we use Python 2.6 + - '[ ! -f ./tests/travis/install_python_2.6.sh ] || ./tests/travis/install_python_2.6.sh' + - ./tests/travis/configure_git.sh # travis now complains about this failing 9 times out of 10, so removing it |