TASK: merge changes made on support/62 branch to support/76

This commit is contained in:
Willi Wehmeier 2017-10-25 10:50:44 +02:00
parent 97dbe75eeb
commit a3323b326c
2 changed files with 32 additions and 17 deletions

View file

@ -1,13 +1,3 @@
sudo: true
addons:
apt:
packages:
- oracle-java8-set-default
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
- mysql -u root -e 'GRANT ALL ON `typo3_ci_ft%`.* TO travis@127.0.0.1;'
language: php
php:
@ -25,19 +15,44 @@ env:
- typo3DatabaseHost="127.0.0.1"
- typo3DatabaseUsername="travis"
- typo3DatabasePassword=""
- TYPO3_VERSION="~6.2"
matrix:
- 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="~7.6"
php: 5.6
- env: TYPO3_VERSION="~8"
php: 5.6
- env: TYPO3_VERSION="dev-master"
php: 5.6
allow_failures:
# 7 and 8 are not working due to current relation resolving.
# See: https://github.com/DanielSiepmann/search_core/projects/1
- env: TYPO3_VERSION="~7.6"
php: 7.0
- env: TYPO3_VERSION="~7.6"
php: 7.1
- 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:
- mysql
- elasticsearch
install: make install
script:
- make unitTests
- make functionalTests
script: make functionalTests
after_script:
- make uploadCodeCoverage

View file

@ -4,15 +4,15 @@ current_dir := $(dir $(mkfile_path))
TYPO3_WEB_DIR := $(current_dir).Build/web
TYPO3_PATH_ROOT := $(current_dir).Build/web
# Allow different versions on travis
TYPO3_VERSION ?= ~6.2
typo3DatabaseName ?= "searchcore_test"
TYPO3_VERSION ?= ~8.7
typo3DatabaseName ?= "searchcore_test2"
typo3DatabaseUsername ?= "dev"
typo3DatabasePassword ?= "dev"
typo3DatabaseHost ?= "127.0.0.1"
.PHONY: install
install: clean
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-source --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)"
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-dist --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)"
git checkout composer.json
functionalTests: