mirror of
https://github.com/Codappix/search_core.git
synced 2024-11-23 20:36:12 +01:00
FIX: correct changes between support branches found by comparison
This commit is contained in:
parent
dd0cfc2377
commit
b8abaef0d2
2 changed files with 6 additions and 3 deletions
|
@ -11,6 +11,8 @@ before_install:
|
||||||
language: php
|
language: php
|
||||||
|
|
||||||
php:
|
php:
|
||||||
|
- 5.6
|
||||||
|
- 7.0
|
||||||
- 7.1
|
- 7.1
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
@ -23,6 +25,7 @@ env:
|
||||||
- typo3DatabaseHost="127.0.0.1"
|
- typo3DatabaseHost="127.0.0.1"
|
||||||
- typo3DatabaseUsername="travis"
|
- typo3DatabaseUsername="travis"
|
||||||
- typo3DatabasePassword=""
|
- typo3DatabasePassword=""
|
||||||
|
- TYPO3_VERSION="~7.6"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -4,15 +4,15 @@ current_dir := $(dir $(mkfile_path))
|
||||||
TYPO3_WEB_DIR := $(current_dir).Build/web
|
TYPO3_WEB_DIR := $(current_dir).Build/web
|
||||||
TYPO3_PATH_ROOT := $(current_dir).Build/web
|
TYPO3_PATH_ROOT := $(current_dir).Build/web
|
||||||
# Allow different versions on travis
|
# Allow different versions on travis
|
||||||
TYPO3_VERSION ?= ~8.7
|
TYPO3_VERSION ?= ~7.6
|
||||||
typo3DatabaseName ?= "searchcore_test2"
|
typo3DatabaseName ?= "searchcore_test"
|
||||||
typo3DatabaseUsername ?= "dev"
|
typo3DatabaseUsername ?= "dev"
|
||||||
typo3DatabasePassword ?= "dev"
|
typo3DatabasePassword ?= "dev"
|
||||||
typo3DatabaseHost ?= "127.0.0.1"
|
typo3DatabaseHost ?= "127.0.0.1"
|
||||||
|
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: clean
|
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
|
git checkout composer.json
|
||||||
|
|
||||||
functionalTests:
|
functionalTests:
|
||||||
|
|
Loading…
Reference in a new issue