diff --git a/Build/gitlab-ci/pre-merge/acceptance-application.yml b/Build/gitlab-ci/pre-merge/acceptance-application.yml index 24ef42be8cf546e79182f755ac3bb607117fab0c..545313ee22db0f5bbf4d729ffbf4df3b327ff532 100644 --- a/Build/gitlab-ci/pre-merge/acceptance-application.yml +++ b/Build/gitlab-ci/pre-merge/acceptance-application.yml @@ -9,7 +9,7 @@ acceptance application mariadb php 7.4 pre-merge: paths: - typo3temp/var/tests/acceptance/typo3temp/var/log - typo3temp/var/tests/AcceptanceReports - parallel: 10 + parallel: 13 script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s acceptance -p 7.4 -d mariadb -i 10.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL @@ -25,7 +25,7 @@ acceptance application mariadb php 8.0 pre-merge: paths: - typo3temp/var/tests/acceptance/typo3temp/var/log - typo3temp/var/tests/AcceptanceReports - parallel: 10 + parallel: 13 script: - Build/Scripts/runTests.sh -s composerInstall -p 8.0 - Build/Scripts/runTests.sh -s acceptance -p 8.0 -d mariadb -i 10.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL diff --git a/Build/gitlab-ci/pre-merge/functional.yml b/Build/gitlab-ci/pre-merge/functional.yml index ea68c748ad584468969eb17d2aa8171c6c7dc9c4..f55a6e355f1b625fe41fb599d9a1312d878026a6 100644 --- a/Build/gitlab-ci/pre-merge/functional.yml +++ b/Build/gitlab-ci/pre-merge/functional.yml @@ -4,7 +4,7 @@ functional mariadb 10.3 php 8.0 pre-merge: refs: - schedules - master - parallel: 10 + parallel: 6 script: - Build/Scripts/runTests.sh -s composerInstall -p 8.0 - Build/Scripts/runTests.sh -s functional -d mariadb -i 10.3 -p 8.0 -c $CI_NODE_INDEX/$CI_NODE_TOTAL @@ -26,7 +26,7 @@ functional sqlite php 7.4 pre-merge: refs: - schedules - master - parallel: 10 + parallel: 5 script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s functional -d sqlite -p 7.4 -c $CI_NODE_INDEX/$CI_NODE_TOTAL diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml index 28b5d7d07fdfb940b900ba2900c4d23de1454602..7ad1a89af05a9be39ce907d290999e02f9a4a60a 100644 --- a/Build/testing-docker/local/docker-compose.yml +++ b/Build/testing-docker/local/docker-compose.yml @@ -1045,6 +1045,8 @@ services: functional_sqlite: image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest user: "${HOST_UID}" + tmpfs: + - ${CORE_ROOT}/typo3temp/var/tests/functional-sqlite-dbs/:rw,noexec,nosuid,uid=${HOST_UID} volumes: - ${CORE_ROOT}:${CORE_ROOT} - ${HOST_HOME}:${HOST_HOME} diff --git a/composer.json b/composer.json index 20f6b6f6a5f292d3840148efcdb63b2693776297..7c04d0c253c882cccb0d8a4f9ff8cbdfbd15bd02 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,7 @@ "phpstan/phpstan": "^0.12.64", "phpunit/phpunit": "^9.5", "typo3/cms-styleguide": "~11.4.0", - "typo3/testing-framework": "^6.9.0" + "typo3/testing-framework": "^6.10.0" }, "suggest": { "ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images", diff --git a/composer.lock b/composer.lock index b7e5ab19f553e2fcecbfbaad0dc7521e8325fd73..532dcad2798143891f75538684417788c6ce81ea 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "18ef972ae8ceffb3b4f8e1a1aef18269", + "content-hash": "e246c1dc9e21edf07358183d7e687b01", "packages": [ { "name": "bacon/bacon-qr-code", @@ -8246,20 +8246,22 @@ }, { "name": "typo3/testing-framework", - "version": "6.9.0", + "version": "6.10.0", "source": { "type": "git", "url": "https://github.com/TYPO3/testing-framework.git", - "reference": "16ec225d7289caa1e4b9e8c33969dde9034b8613" + "reference": "d48c83d816a8426d38ead3fb042ac9c61a851bfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/16ec225d7289caa1e4b9e8c33969dde9034b8613", - "reference": "16ec225d7289caa1e4b9e8c33969dde9034b8613", + "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/d48c83d816a8426d38ead3fb042ac9c61a851bfd", + "reference": "d48c83d816a8426d38ead3fb042ac9c61a851bfd", "shasum": "" }, "require": { + "guzzlehttp/psr7": "^1.7 || ^2.0", "mikey179/vfsstream": "~1.6.8", + "php": ">= 7.2", "phpunit/phpunit": "^8.4 || ^9.0", "psr/container": "^1.0", "typo3/cms-backend": "10.*.*@dev || 11.*.*@dev", @@ -8305,9 +8307,9 @@ "support": { "general": "https://typo3.org/support/", "issues": "https://github.com/TYPO3/testing-framework/issues", - "source": "https://github.com/TYPO3/testing-framework/tree/6.9.0" + "source": "https://github.com/TYPO3/testing-framework/tree/6.10.0" }, - "time": "2021-08-06T14:12:49+00:00" + "time": "2021-08-29T13:30:52+00:00" } ], "aliases": [],