From af4eae1e839e9a2e55fc6cbcb02b343425b965d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan@buerk.tech>
Date: Wed, 27 Apr 2022 17:03:19 +0200
Subject: [PATCH] [TASK] Update composer v2 error message in runTests.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
composer v2 is no longer an experimental feature of
Docker Desktop for MacOS/Windows. Broken composer v2
error message should be updated to give proper actual
information how to disable it correctly.
Resolves: #97489
Releases: main, 11.5, 10.4
Change-Id: I7c4199e5d3d3c47bbadba8210cc96b0385ab6fcc
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74456
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
---
Build/Scripts/runTests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index 02c84c2fb418..a29ae0addc7e 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -299,7 +299,7 @@ DOCKER_COMPOSE_VERSION=$(docker-compose version --short)
DOCKER_COMPOSE_MAJOR=$(echo "$DOCKER_COMPOSE_VERSION" | cut -d'.' -f1 | tr -d 'v')
if [ "$DOCKER_COMPOSE_MAJOR" -gt "1" ]; then
echo "docker-compose $DOCKER_COMPOSE_VERSION is currently broken and not supported by runTests.sh."
- echo "If you are running Docker Desktop for MacOS/Windows disable 'Use Docker Compose V2 release candidate' (Settings > Experimental Features)"
+ echo "If you are running Docker Desktop for MacOS/Windows disable 'Use Docker Compose V2' (Preferences > General)"
exit 1
fi
--
GitLab