From 3bd2b9c52d16069693049fb8357b9c1677eebd2d Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Fri, 9 Dec 2016 19:50:53 +0100 Subject: [PATCH] WIP|FEATURE: Integrate functional tests into travis --- .travis.yml | 10 ++++++++++ Makefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a7ae7b..cef088d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,11 @@ php: - 7.0 env: + global: + - TYPO3_DATABASE_NAME="typo3_ci" + - TYPO3_DATABASE_HOST="127.0.0.1" + - TYPO3_DATABASE_USERNAME="root" + - TYPO3_DATABASE_PASSWORD="" matrix: - TYPO3_VERSION="~6.2" - TYPO3_VERSION="~7.6" @@ -22,9 +27,14 @@ matrix: - env: TYPO3_VERSION="dev-master" php: 5.6 +services: + - mysql-5.6 + - elasticsearch-5.0 + before_install: - composer self-update - composer --version + - mysql -u root -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')" install: - make install diff --git a/Makefile b/Makefile index 92aeffc..0eeb8ed 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ typo3DatabaseHost ?= "127.0.0.1" .PHONY: install install: rm .Build - COMPOSER_PROCESS_TIMEOUT=1000 composer require -vvv --dev typo3/cms="$(TYPO3_VERSION)" + COMPOSER_PROCESS_TIMEOUT=1000 composer require -vvv --dev --prefer-source typo3/cms="$(TYPO3_VERSION)" git checkout composer.json mkdir -p $(TYPO3_WEB_DIR)/uploads $(TYPO3_WEB_DIR)/typo3temp