From 4358d84c16978c2696b3756a2ef0306210695ace Mon Sep 17 00:00:00 2001 From: Andy Footner Date: Mon, 5 Aug 2024 18:12:54 +0200 Subject: [PATCH] chore: no longer a hyphen in docker compose Refs: OPS-10398 --- .github/workflows/run-tests.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c3866f29..842d7394 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -103,10 +103,10 @@ jobs: uses: cafuego/command-output@main with: run: | - docker-compose -f tests/docker-compose.yml up -d + docker compose -f tests/docker-compose.yml up -d sleep 10 docker ps -a - docker-compose -f tests/docker-compose.yml exec -w /srv/www -T drupal composer install + docker compose -f tests/docker-compose.yml exec -w /srv/www -T drupal composer install env: fail-fast: true @@ -115,7 +115,7 @@ jobs: uses: cafuego/command-output@main with: run: | - docker-compose -f tests/docker-compose.yml exec -u appuser -w /srv/www -T drupal phpcs -p --report=full --standard=phpcs.xml ./html/modules/custom + docker compose -f tests/docker-compose.yml exec -u appuser -w /srv/www -T drupal phpcs -p --report=full --standard=phpcs.xml ./html/modules/custom env: fail-fast: true @@ -124,7 +124,7 @@ jobs: uses: cafuego/command-output@main with: run: | - docker-compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config minimal install_configure_form.enable_update_status_emails=NULL + docker compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config minimal install_configure_form.enable_update_status_emails=NULL env: fail-fast: true @@ -133,13 +133,13 @@ jobs: uses: cafuego/command-output@main with: run: | - docker-compose -f tests/docker-compose.yml exec -T drupal drush -y en dblog - docker-compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files /srv/www/html/sites/default/private - docker-compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/build/logs - docker-compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs - docker-compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/default/files/browser_output - docker-compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files/browser_output - docker-compose -f tests/docker-compose.yml exec -T -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e DTT_BASE_URL=http://127.0.0.1 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug + docker compose -f tests/docker-compose.yml exec -T drupal drush -y en dblog + docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files /srv/www/html/sites/default/private + docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/build/logs + docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs + docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/default/files/browser_output + docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files/browser_output + docker compose -f tests/docker-compose.yml exec -T -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e DTT_BASE_URL=http://127.0.0.1 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug env: fail-fast: true @@ -148,7 +148,7 @@ jobs: uses: cafuego/command-output@main with: run: | - docker cp "$(docker-compose -f tests/docker-compose.yml ps -q drupal)":/srv/www/html/build/logs/clover.xml . + docker cp "$(docker compose -f tests/docker-compose.yml ps -q drupal)":/srv/www/html/build/logs/clover.xml . - name: Monitor coverage id: coveralls @@ -168,7 +168,7 @@ jobs: uses: cafuego/command-output@main with: run: | - docker-compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show --count=50 --extended + docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show --count=50 --extended - name: Find Comment uses: peter-evans/find-comment@v3