From 379a3341dd57b41f341cf05175f6e0601e6d6a60 Mon Sep 17 00:00:00 2001 From: AaronGilMartinez Date: Thu, 14 Nov 2024 08:53:31 +0100 Subject: [PATCH] Issue CollaboraOnline/collabora-drupal#52: Replace matrix with extra step. --- .github/workflows/ci.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 524e2600..a44288f4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,6 @@ jobs: fail-fast: true matrix: php: [8.1, 8.2, 8.3] - groupmedia: [3, 4] steps: - uses: actions/checkout@v4 @@ -55,20 +54,17 @@ jobs: - name: Composer install run: | docker-compose exec -T web composer config --merge --json "extra.patches" '{"drupal/group": {"Using a translatable string as a category for field type is deprecated - https://www.drupal.org/project/group/issues/3458530": "https://www.drupal.org/files/issues/2024-07-02/group-translate-string-as-category-is-deprecated_0.patch"}}' - docker-compose exec -T web composer require --dev cweagans/composer-patches drupal/groupmedia:~${{ matrix.groupmedia }} + docker-compose exec -T web composer require --dev cweagans/composer-patches - name: Drupal site install run: | docker-compose exec -T web ./vendor/bin/run drupal:site-install - name: PhpUnit - if: ${{ matrix.groupmedia != '3' }} run: | - docker-compose exec -T web ./vendor/bin/phpunit -vvv --debug + docker-compose exec -T web ./vendor/bin/phpunit -vvv --debug - - name: PhpUnit - if: ${{ matrix.groupmedia == '3' }} + - name: PhpUnit - groupmedia 3 run: | - docker-compose exec -T web ./vendor/bin/phpunit -vvv --debug --testsuite "Collabora Online Group" - - + docker-compose exec -T web composer require --dev drupal/groupmedia:^3 + docker-compose exec -T web ./vendor/bin/phpunit -vvv --debug --testsuite "Collabora Online Group"