Fix COMPOSER_ARGS in/with .ci/compose.yaml

This commit is contained in:
Pablo Zmdl 2025-10-06 11:41:20 +02:00
parent fc6a28a1da
commit 1f88ae4840
2 changed files with 6 additions and 6 deletions

View File

@ -33,7 +33,7 @@ services:
TESTRUNNER_DOWNLOADS_DIR: './tests/Browser/downloads'
RC_CONFIG_IMAP_HOST: 'tls://mailhost:3143'
RC_CONFIG_SMTP_HOST: 'mailhost:3025'
COMPOSER_ARGS: ${COMPOSER_ARGS:-''}
COMPOSER_ARGS: ${COMPOSER_ARGS:-}
working_dir: /work
command: '/usr/local/bin/run-in-copy.sh .ci/run_browser_tests.sh'
@ -42,7 +42,7 @@ services:
- mailhost
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
environment:
COMPOSER_ARGS: ${COMPOSER_ARGS:-''}
COMPOSER_ARGS: ${COMPOSER_ARGS:-}
volumes:
- '..:/app'
working_dir: /work
@ -53,7 +53,7 @@ services:
- mailhost
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
environment:
COMPOSER_ARGS: ${COMPOSER_ARGS:-''}
COMPOSER_ARGS: ${COMPOSER_ARGS:-}
RC_CONFIG_IMAP_HOST: 'tls://mailhost:3143'
volumes:
- '..:/app'
@ -63,7 +63,7 @@ services:
codespell:
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
environment:
COMPOSER_ARGS: ${COMPOSER_ARGS:-''}
COMPOSER_ARGS: ${COMPOSER_ARGS:-}
volumes:
- '..:/app'
entrypoint: ./.ci/run_php-cs-fixer.sh
@ -71,7 +71,7 @@ services:
codestyle:
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
environment:
COMPOSER_ARGS: ${COMPOSER_ARGS:-''}
COMPOSER_ARGS: ${COMPOSER_ARGS:-}
volumes:
- '..:/app'
entrypoint: ./.ci/run_phpstan.sh

View File

@ -35,7 +35,7 @@ jobs:
if: ${{ matrix.php == '8.5' }}
env:
ROUNDCUBEMAIL_IMAGE_MESSAGE_RENDERING: ghcr.io/roundcube/roundcubemail:php8.5-rc
COMPOSE_ARGS: '--ignore-platform-reqs'
COMPOSER_ARGS: '--ignore-platform-reqs'
run: docker compose -f .ci/compose.yaml run test_message_rendering
- name: Upload artifacts