From d32200d9e35f07b4240e29a03048594505b2f0ec Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Wed, 31 Jul 2024 21:57:04 +0200 Subject: [PATCH 1/6] Update matrix to be in sync with drupal/driver --- .github/workflows/ci.yml | 18 +++++++----------- composer.json | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc1a5f1c..9d890b19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,19 +6,15 @@ jobs: strategy: fail-fast: false matrix: - php_version: ["7.4", "8.0", "8.1", "8.2"] - drupal_version: ["9", "10.0", "10.1"] - exclude: + include: - php_version: "7.4" - drupal_version: "10.0" - - php_version: "7.4" - drupal_version: "10.1" - - php_version: "8.0" - drupal_version: "10.0" - - php_version: "8.0" - drupal_version: "10.1" - - php_version: "8.2" drupal_version: "9" + - php_version: "8.2" + drupal_version: "10" + - php_version: "8.3" + drupal_version: "10" + - php_version: "8.3" + drupal_version: "11" env: PHP_VERSION: ${{ matrix.php_version }} DRUPAL_VERSION: ${{ matrix.drupal_version }} diff --git a/composer.json b/composer.json index b10e57e5..a54e58e7 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "behat/behat": "~3.2", "behat/mink-browserkit-driver": "^2.1.0", "behat/mink-selenium2-driver": "~1.1", - "drupal/drupal-driver": "^2.2.1", + "drupal/drupal-driver": "^2.2.1 || dev-master", "friends-of-behat/mink-extension": "^2.7.1", "symfony/http-client": "~4.4 || ^5 || ^6", "webflo/drupal-finder": "^1.2" From 7658233a684ec96949d38dca088edc954fd8dd3b Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Wed, 31 Jul 2024 22:02:30 +0200 Subject: [PATCH 2/6] allow drush 13 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a54e58e7..63217e99 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "drupal/coder": "^8.3", "drupal/core": "^10", "drupal/core-composer-scaffold": "^10", - "drush/drush": "^11.6.0 || ^12.4", + "drush/drush": "^11.6.0 || ^12.4 || ^13", "php-parallel-lint/php-parallel-lint": "^1.3", "phpspec/phpspec": "^4.0 || ^6.0 || ^7.0" }, From b0ae64623661d38d5cb5d208a6b66f2d1016f351 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Wed, 31 Jul 2024 22:02:36 +0200 Subject: [PATCH 3/6] switch to docker compose --- .github/workflows/ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d890b19..6a8bbaa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,36 +22,36 @@ jobs: steps: - name: clone uses: actions/checkout@v3 - - name: docker-compose up -d - run: docker-compose up -d + - name: docker compose up -d + run: docker compose up -d - name: npm install - run: docker-compose exec -T -u node node npm install + run: docker compose exec -T -u node node npm install - name: composer self-update - run: docker-compose exec -T php composer self-update + run: docker compose exec -T php composer self-update - name: composer require - run: docker-compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/core:^${DRUPAL_VERSION} drupal/core-composer-scaffold:^${DRUPAL_VERSION} + run: docker compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/core:^${DRUPAL_VERSION} drupal/core-composer-scaffold:^${DRUPAL_VERSION} - name: composer install - run: docker-compose exec -T php composer install + run: docker compose exec -T php composer install - name: drush site-install - run: docker-compose exec -T php ./vendor/bin/drush --yes --root=drupal site-install --db-url=mysql://drupal:drupal@db/drupal --debug + run: docker compose exec -T php ./vendor/bin/drush --yes --root=drupal site-install --db-url=mysql://drupal:drupal@db/drupal --debug - name: copy fixtures - run: docker-compose exec -T php cp -r fixtures/drupal/modules/behat_test drupal/modules + run: docker compose exec -T php cp -r fixtures/drupal/modules/behat_test drupal/modules - name: drush pmu page_cache - run: docker-compose exec -T php ./vendor/bin/drush --yes --root=drupal pmu page_cache,big_pipe + run: docker compose exec -T php ./vendor/bin/drush --yes --root=drupal pmu page_cache,big_pipe - name: drush en behat_test - run: docker-compose exec -T php ./vendor/bin/drush --yes --root=drupal en behat_test + run: docker compose exec -T php ./vendor/bin/drush --yes --root=drupal en behat_test - name: npm test - run: docker-compose exec -T -u node node npm test + run: docker compose exec -T -u node node npm test - name: composer test - run: docker-compose exec -T php composer test + run: docker compose exec -T php composer test - name: behat --profile=blackbox - run: docker-compose exec -T php vendor/bin/behat -fprogress --strict + run: docker compose exec -T php vendor/bin/behat -fprogress --strict - name: behat --profile=drupal9 if: "${{ matrix.drupal_version == '9'}}" - run: docker-compose exec -T php cat && docker-compose exec -T php vendor/bin/behat -fprogress --profile=drupal9 --strict + run: docker compose exec -T php cat && docker compose exec -T php vendor/bin/behat -fprogress --profile=drupal9 --strict - name: behat --profile=drupal10 if: "${{ matrix.drupal_version != '9'}}" - run: docker-compose exec -T php cat && docker-compose exec -T php vendor/bin/behat -fprogress --profile=drupal10 --strict + run: docker compose exec -T php cat && docker compose exec -T php vendor/bin/behat -fprogress --profile=drupal10 --strict - name: behat --profile=drupal_https if: "${{ matrix.drupal_version != '9'}}" - run: docker-compose exec -T php cat && docker-compose exec -T php vendor/bin/behat -fprogress --profile=drupal_https --strict + run: docker compose exec -T php cat && docker compose exec -T php vendor/bin/behat -fprogress --profile=drupal_https --strict From 6b280100c164f543685da7ac097e609501967807 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Wed, 31 Jul 2024 22:05:41 +0200 Subject: [PATCH 4/6] Update to mariadb 10.6 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 506cba53..11ee541a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,7 +74,7 @@ services: - "traefik.enable=false" db: - image: wodby/mariadb:10.3-3.8.4 + image: wodby/mariadb:10.6-3.28.3 stop_grace_period: 30s environment: MYSQL_ROOT_PASSWORD: password From fd733ede4e5206c00453e50fe5b4b69568caab4e Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Wed, 31 Jul 2024 22:08:53 +0200 Subject: [PATCH 5/6] Make behat_test module D11 compatible --- fixtures/drupal/modules/behat_test/behat_test.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/drupal/modules/behat_test/behat_test.info.yml b/fixtures/drupal/modules/behat_test/behat_test.info.yml index e92ba6ca..00c6de81 100644 --- a/fixtures/drupal/modules/behat_test/behat_test.info.yml +++ b/fixtures/drupal/modules/behat_test/behat_test.info.yml @@ -2,6 +2,6 @@ name: Behat test type: module description: 'Test feature exposing basic configuration for Behat Drupal extension test.' package: Test -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 dependencies: - drupal:language From 81e9e81da9aaa7db7693731ce9154fd0e5e6f290 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Wed, 31 Jul 2024 22:11:23 +0200 Subject: [PATCH 6/6] remove obsolete docker compose version --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 11ee541a..e03b916c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "2" services: php: