Update matrix to be in sync with drupal/driver

jhedstrom · Jul 31, 2024 · d32200d · d32200d
1 parent 22d69d8
commit d32200d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git 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
@@ -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"