diff options
| author | diosmosis <benaka@piwik.pro> | 2015-09-22 08:31:05 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-10-27 07:46:24 +0300 |
| commit | 34b402dd6f95d78c3d924a7977cdb35046413861 (patch) | |
| tree | a8a3742647eb1d642e055911316c648f339ebe3a /.travis.yml | |
| parent | 7be17db4b1aaf72752ed5e940c7fe8377784bab2 (diff) | |
Enable container based travis build + remove python 2.6 install script.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 134bc5ee8d..161db61c1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,14 @@ php: services: - redis-server +addons: + apt: + sources: + - deadsnakes + packages: + - python2.6 + - python2.6-dev + # Separate different test suites env: matrix: @@ -91,7 +99,7 @@ matrix: - php: 7 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 -sudo: required +sudo: false script: $PIWIK_ROOT_DIR/tests/travis/travis.sh @@ -107,9 +115,6 @@ 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' - - ./tests/travis/configure_git.sh # travis now complains about this failing 9 times out of 10, so removing it |