Skip to content

Commit f63155b

Browse files
committed
[BUGFIX] install TYPO3 v13 in CI
1 parent 49452f3 commit f63155b

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v6
2121

2222
- name: Install testing system
23-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s composerUpdate
23+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s composerInstall
2424

2525
- name: Composer validate
2626
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerValidate

Build/Scripts/runTests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ PHP_XDEBUG_PORT=9003
116116
EXTRA_TEST_OPTIONS=""
117117
SCRIPT_VERBOSE=0
118118
CGLCHECK_DRY_RUN=""
119-
TYPO3="13"
119+
TYPO3="14"
120120

121121
# Option parsing
122122
# Reset in case getopts has been used previously in the shell
@@ -209,9 +209,9 @@ case ${TEST_SUITE} in
209209
SUITE_EXIT_CODE=$?
210210
docker compose down
211211
;;
212-
composerUpdate)
212+
composerInstall)
213213
setUpDockerComposeDotEnv
214-
docker compose run composer_update
214+
docker compose run composer_install
215215
SUITE_EXIT_CODE=$?
216216
docker compose down
217217
;;

Build/testing-docker/docker-compose.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
${CORE_ROOT}/.Build/bin/php-cs-fixer fix --config Build/php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no
1919
"
2020
21-
composer_update:
21+
composer_install:
2222
image: ${DOCKER_PHP_IMAGE}
2323
user: "${HOST_UID}"
2424
volumes:
@@ -33,7 +33,12 @@ services:
3333
set -x
3434
fi
3535
php -v | grep '^PHP';
36-
COMPOSER_HOME=${CORE_ROOT}/.Build/.composer composer update --no-progress --no-interaction;
36+
if [ ${TYPO3} -eq 13 ]; then
37+
COMPOSER_HOME=${CORE_ROOT}/.Build/.composer composer require typo3/cms-core:^13.4 --dev -W --no-progress --no-interaction --no-plugins;
38+
else
39+
COMPOSER_HOME=${CORE_ROOT}/.Build/.composer composer install --no-progress --no-interaction;
40+
fi
41+
3742
"
3843
3944
composer_validate:

0 commit comments

Comments
 (0)