feat: single full.bats test and GHA matrix strategy

ddev · Oct 8, 2024 · 45986cf · 45986cf
1 parent c0a8cc6
commit 45986cf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 42 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,6 +28,7 @@ jobs:
     strategy:
       matrix:
         ddev_version: [stable, HEAD]
+        drupal_version: ["default", "10", "11"]
       fail-fast: false
 
     runs-on: ubuntu-latest
@@ -40,3 +41,4 @@ jobs:
         debug_enabled: ${{ github.event.inputs.debug_enabled }}
         addon_repository: ${{ env.GITHUB_REPOSITORY }}
         addon_ref: ${{ env.GITHUB_REF }}
+        test_command: TEST_DRUPAL_CORE=${{ matrix.drupal_version }} bats tests
diff --git a/tests/default-no-composer-json.bats b/tests/default-no-composer-json.bats
@@ -1,4 +1,11 @@
 setup_file() {
+  if [ -z "$TEST_DRUPAL_CORE" ]; then
+    echo "TEST_DRUPAL_CORE is necessary to run tests" >&2
+    exit 1
+  fi
+  if [ "$TEST_DRUPAL_CORE" != "default" ]; then
+    skip "TEST_DRUPAL_CORE=$TEST_DRUPAL_CORE not handled by this test suite" >&2
+  fi
   load '_common.bash'
   _common_setup
 }

diff --git a/tests/full-d11.bats b/tests/full-d11.bats
diff --git a/tests/full-d10.bats → tests/full.bats b/tests/full-d10.bats → tests/full.bats
@@ -1,8 +1,17 @@
 setup_file() {
-  export TEST_DRUPAL_CORE=10
+  if [ -z "$TEST_DRUPAL_CORE" ]; then
+    echo "TEST_DRUPAL_CORE is necessary to run tests" >&2
+    exit 1
+  fi
+  if [ "$TEST_DRUPAL_CORE" != "10" ] && [ "$TEST_DRUPAL_CORE" != "11"  ]; then
+    skip "TEST_DRUPAL_CORE=$TEST_DRUPAL_CORE not handled by this test suite" >&2
+  fi
   load '_common.bash'
   _common_setup
   ddev config --php-version=8.2
+  if [ "$TEST_DRUPAL_CORE" = "11" ]; then
+    ddev config --php-version=8.3 --corepack-enable
+  fi
 }
 
 teardown_file() {