Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-22 04:36:11 +01:00
Code Releases Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Willi Wehmeier 2019-06-06 15:01:05 +02:00
commit 7f36ed54ec
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -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;'

2
Makefile
View file

@ -21,7 +21,7 @@ install: clean
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 --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)"
git checkout composer.json
cgl: