From b7084367ec41b4f91eb7ebdf4f62ef246a09cc8e Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 6 Jun 2019 13:32:52 +0200 Subject: [PATCH 1/2] Fix travis configuration --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54c2637..7e83e4d 100644 --- a/.travis.yml +++ b/.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;' From 81c3aa7e358c184fe0ac85fcc558c14491f27615 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 6 Jun 2019 13:36:35 +0200 Subject: [PATCH 2/2] Remove unnecessary debugging output during installation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21f6c31..1430633 100644 --- a/Makefile +++ b/Makefile @@ -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: