mirror of
https://github.com/Codappix/search_core.git
synced 2024-12-23 03:36:09 +01:00
Update required versions and CI
Main goal is to allow Travis to run builds again. Beside that, we do no longer support TYPO3 CMS 7, but 8.7 and 9.5.
This commit is contained in:
parent
7270ae0035
commit
67c75ac3cf
4 changed files with 14 additions and 39 deletions
11
.travis.yml
11
.travis.yml
|
@ -1,9 +1,5 @@
|
|||
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 restart
|
||||
- mysql -u root -e 'GRANT ALL ON `typo3_ci_ft%`.* TO travis@127.0.0.1;'
|
||||
|
@ -11,9 +7,8 @@ before_install:
|
|||
language: php
|
||||
|
||||
php:
|
||||
- 7.0
|
||||
- 7.1
|
||||
- 7.2
|
||||
- 7.3
|
||||
|
||||
env:
|
||||
global:
|
||||
|
@ -26,8 +21,8 @@ env:
|
|||
- typo3DatabaseUsername="travis"
|
||||
- typo3DatabasePassword=""
|
||||
matrix:
|
||||
- TYPO3_VERSION="~7.6"
|
||||
- TYPO3_VERSION="~8.7"
|
||||
- TYPO3_VERSION="^8.7"
|
||||
- TYPO3_VERSION="^9.5"
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
|
|
13
Makefile
13
Makefile
|
@ -4,24 +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
|
||||
TYPO3_VERSION ?= ^9.5
|
||||
typo3DatabaseName ?= "searchcore_test"
|
||||
typo3DatabaseUsername ?= "dev"
|
||||
typo3DatabasePassword ?= "dev"
|
||||
typo3DatabaseHost ?= "127.0.0.1"
|
||||
|
||||
sourceOrDist=--prefer-dist
|
||||
ifeq ($(TYPO3_VERSION),~7.6)
|
||||
sourceOrDist=--prefer-source
|
||||
endif
|
||||
|
||||
.PHONY: install
|
||||
install: clean
|
||||
if [ $(TYPO3_VERSION) = ~7.6 ]; then \
|
||||
patch composer.json Tests/InstallPatches/composer.json.patch; \
|
||||
fi
|
||||
|
||||
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)"
|
||||
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev typo3/cms-core="$(TYPO3_VERSION)"
|
||||
git checkout composer.json
|
||||
|
||||
cgl:
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/composer.json b/composer.json
|
||||
index 83e5f47..e9fa296 100644
|
||||
--- a/composer.json
|
||||
+++ b/composer.json
|
||||
@@ -21,8 +21,7 @@
|
||||
"ruflin/elastica": "~3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
- "phpunit/phpunit": "~6.4.4",
|
||||
- "typo3/testing-framework": "~1.1.5",
|
||||
+ "phpunit/phpunit": "~5.7.0",
|
||||
"squizlabs/php_codesniffer": "~3.1.1"
|
||||
},
|
||||
"config": {
|
|
@ -16,14 +16,17 @@
|
|||
}
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.0.0",
|
||||
"typo3/cms-core": ">= 8.7.0 < 10.0.0",
|
||||
"ruflin/elastica": "~3.2"
|
||||
"php": ">=7.2.0 <8",
|
||||
"typo3/cms-core": "^8.7 || ^9.5",
|
||||
"ruflin/elastica": "^3.2"
|
||||
},
|
||||
"suggests": {
|
||||
"typo3/cms-form": "To update indexed records via Formframework."
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~6.4.4",
|
||||
"typo3/testing-framework": "~1.1.5",
|
||||
"squizlabs/php_codesniffer": "~3.1.1"
|
||||
"squizlabs/php_codesniffer": "^3.4",
|
||||
"typo3/testing-framework": "^2.0 || ^4.12",
|
||||
"typo3/cms-form": "^8.7 || ^9.5"
|
||||
},
|
||||
"config": {
|
||||
"optimize-autoloader": true,
|
||||
|
|
Loading…
Reference in a new issue