Commit 7c43c5a1 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[BUGFIX] Testing: COMPOSER_ROOT_VERSION for v10 and v9

With shallow cloning as done by gitlab-ci, composer
needs a hint which version a branch is derived from.
The patch sets according environment variables in the
testing containers for v10 and v9 min/max stages as
done with composer install based on composer.lock file
already.

Resolves: #94051
Releases: 10.4, 9.5
Change-Id: I288a4070a74175bc11706541551c28fee2deb0ae
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/68986

Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent bb07a887
......@@ -674,6 +674,9 @@ services:
- ${PASSWD_PATH}:/etc/passwd:ro
- /etc/group:/etc/group:ro
working_dir: ${CORE_ROOT}
environment:
COMPOSER_ROOT_VERSION: "9.5"
COMPOSER_CACHE_DIR: ".cache/composer"
command: >
/bin/sh -c "
if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
......@@ -683,7 +686,7 @@ services:
# some unit test issues: For instance an even younger doctrine/dbal is then
# fetched, which fails.
# composer config --unset platform.php;
COMPOSER_CACHE_DIR=".cache/composer" composer update --no-progress --no-interaction;
composer update --no-progress --no-interaction;
composer dumpautoload;
"
......@@ -696,13 +699,16 @@ services:
- ${PASSWD_PATH}:/etc/passwd:ro
- /etc/group:/etc/group:ro
working_dir: ${CORE_ROOT}
environment:
COMPOSER_ROOT_VERSION: "9.5"
COMPOSER_CACHE_DIR: ".cache/composer"
command: >
/bin/sh -c "
if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
set -x
fi
composer config platform.php ${PHP_VERSION}.0;
COMPOSER_CACHE_DIR=".cache/composer" composer update --prefer-lowest --no-progress --no-interaction;
composer update --prefer-lowest --no-progress --no-interaction;
composer dumpautoload;
"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment