Merge remote-tracking branch 'origin/develop' into hotfix/fix-non-repeatable-query-building

This commit is contained in:
Daniel Siepmann 2017-08-10 09:06:17 +02:00
commit b138ac0fc0

View file

@ -6,11 +6,11 @@ addons:
- oracle-java8-set-default - oracle-java8-set-default
before_install: before_install:
- curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.2.0.deb && sudo service elasticsearch start - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.2.0.deb && sudo service elasticsearch start
- mysql -u root -e 'GRANT ALL ON `typo3_ci_ft%`.* TO travis@127.0.0.1;'
language: php language: php
php: php:
- 5.6
- 7.0 - 7.0
- 7.1 - 7.1
@ -24,28 +24,7 @@ env:
- typo3DatabaseHost="127.0.0.1" - typo3DatabaseHost="127.0.0.1"
- typo3DatabaseUsername="travis" - typo3DatabaseUsername="travis"
- typo3DatabasePassword="" - typo3DatabasePassword=""
matrix:
- TYPO3_VERSION="~7.6" - TYPO3_VERSION="~7.6"
- TYPO3_VERSION="~8"
- TYPO3_VERSION="dev-master"
matrix:
fast_finish: true
exclude:
# TYPO3 no longer supports 5.6
- env: TYPO3_VERSION="~8"
php: 5.6
- env: TYPO3_VERSION="dev-master"
php: 5.6
allow_failures:
- env: TYPO3_VERSION="~8"
php: 7.0
- env: TYPO3_VERSION="~8"
php: 7.1
- env: TYPO3_VERSION="dev-master"
php: 7.0
- env: TYPO3_VERSION="dev-master"
php: 7.1
services: services:
- mysql - mysql