Merge pull request #677 from Berdir/d11

Drupal 11 testing
jhedstrom · Oct 7, 2024 · 302b09c · 302b09c
2 parents 22d69d8 + 81e9e81
commit 302b09c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,56 +6,52 @@ 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 }}
       DOCKER_USER_ID: "1001"
     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
diff --git 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"
@@ -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"
   },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "2"
 services:
 
   php:
@@ -74,7 +73,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

diff --git 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