From b8abaef0d2f408f853f4067fb1227be8c27485f1 Mon Sep 17 00:00:00 2001 From: Willi Wehmeier Date: Wed, 25 Oct 2017 12:01:08 +0200 Subject: [PATCH] FIX: correct changes between support branches found by comparison --- .travis.yml | 3 +++ Makefile | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4490198..73a7888 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ before_install: language: php php: + - 5.6 + - 7.0 - 7.1 env: @@ -23,6 +25,7 @@ env: - typo3DatabaseHost="127.0.0.1" - typo3DatabaseUsername="travis" - typo3DatabasePassword="" + - TYPO3_VERSION="~7.6" matrix: fast_finish: true diff --git a/Makefile b/Makefile index b6bc72b..19220b9 100644 --- a/Makefile +++ b/Makefile @@ -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 ?= ~8.7 -typo3DatabaseName ?= "searchcore_test2" +TYPO3_VERSION ?= ~7.6 +typo3DatabaseName ?= "searchcore_test" typo3DatabaseUsername ?= "dev" typo3DatabasePassword ?= "dev" typo3DatabaseHost ?= "127.0.0.1" .PHONY: install install: clean - COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-dist --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)" + COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-source --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)" git checkout composer.json functionalTests: