diff options
| author | diosmosis <benaka@piwik.pro> | 2015-07-19 02:38:02 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-07-19 02:38:02 +0300 |
| commit | fc87d6a189b5b0742fd8d4029ffea0fde15fa3ce (patch) | |
| tree | e7900a057a49750f0a0066242bd88b459dafadf0 /.travis.yml | |
| parent | 92f5e5c26d979fe824e373d406f9e0e3fe36814c (diff) | |
Moving composer update and mysql/python install from before_script section to install section.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 2d48f8a983..35eb5c3b11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,12 +88,20 @@ 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 + # travis now complains about this failing 9 times out of 10, so removing it + #- travis_retry composer self-update -before_script: - - '[ ! -f ./tests/travis/install_mysql_5.6.sh ] || ./tests/travis/install_mysql_5.6.sh' + - '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install' + +before_script: - phpenv config-rm xdebug.ini; # add always_populate_raw_post_data=-1 to php.ini @@ -119,21 +127,12 @@ before_script: - mysql -e "SELECT @@sql_mode;" # - mysql -e "SHOW GLOBAL VARIABLES;" - # travis now complains about this failing 9 times out of 10, so removing it - #- travis_retry composer self-update - - - '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install' - # print out more debugging info - uname -a - date - # - php -i - php -r "var_dump(gd_info());" - mysql -e 'create database piwik_tests;' - # Make sure we use Python 2.6 - - '[ ! -f ./tests/travis/install_python_2.6.sh ] || ./tests/travis/install_python_2.6.sh' - - ./tests/travis/prepare.sh - ./tests/travis/setup_webserver.sh |