Merge pull request #6 from itk-dev/feature/matrix

Added version matrix

Author: rimi-itk

.github/workflows/pr.yaml

@@ -10,13 +10,15 @@ jobs:
       matrix:
         drupal-version:
           - 10
-          # Installing Drupal 11 does not yet work with sqlite.
-          # - 11
+          - 11
+        php-version:
+          - 8.3
+          - 8.4
         script-name:
           - phpstan
           - rector
     steps:
       - uses: actions/checkout@v4
       - name: Drupal ${{ matrix.drupal-version }}/${{ matrix.script-name }}
         run: |
-          DRUPAL_VERSION=${{ matrix.drupal-version }} ./scripts/${{ matrix.script-name }}
+          DRUPAL_VERSION=${{ matrix.drupal-version }} PHP_VERSION=${{ matrix.php-version }} ./scripts/${{ matrix.script-name }}

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-6](https://github.com/itk-dev/drupal_admin_message/pull/6)
+  Added version matrix
+
 ## [1.1.0] - 2025-05-21
 
 * [PR-4](https://github.com/itk-dev/drupal_admin_message/pull/4)

scripts/base

@@ -78,14 +78,12 @@ trap teardown EXIT
 setup() {
   compose down --remove-orphans
   compose pull
-  compose up --detach --remove-orphans --wait
+  compose up --detach --remove-orphans --wait --build
   composer config --no-plugins allow-plugins true
   composer config extra.merge-plugin.include "$module_path/composer.json"
   composer require drush/drush wikimedia/composer-merge-plugin
-  # Reset Drupal installation
-  compose exec drupal sh -c 'find . -name .ht.sqlite -ls -delete; rm web/sites/default/settings.php' || true
-  drush site:install --db-url='sqlite://sites/default/files/.ht.sqlite?module=sqlite' --yes
-  drush pm:install "$module_name"
+  drush --yes site:install --db-url='mysql://root:root@mariadb/drupal'
+  drush --yes pm:install "$module_name"
 }
 
 teardown() {

scripts/compose.yaml

@@ -2,8 +2,7 @@
 
 services:
   drupal:
-    # We cannot yet install Drupal 11 with sqlite (cf. https://www.drupal.org/project/drupal/issues/3346338)
-    image: drupal:${DRUPAL_VERSION:-10}-apache
+    image: drupal:${DRUPAL_VERSION:-11}-php${PHP_VERSION:-8.4}
     ports:
       - 80
     volumes:
@@ -19,3 +18,17 @@ services:
     environment:
       # Let the module path, i.e. the mounted path, be known in the container
       MODULE_PATH: web/modules/contrib/${MODULE_NAME:-drupal-module}
+    depends_on:
+      mariadb:
+        condition: service_healthy
+
+  mariadb:
+    image: mariadb
+    healthcheck:
+      test: [ "CMD", "healthcheck.sh", "--connect", "--innodb_initialized" ]
+      start_period: 10s
+      interval: 10s
+      timeout: 5s
+      retries: 3
+    environment:
+      MARIADB_ROOT_PASSWORD: root