From e06407436e48916037badfe7ed8407b349ffd412 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Thu, 7 May 2026 11:09:26 -0600 Subject: [PATCH 1/2] fix(ci): add drupal-contrib to validate workflow matrix drupal-contrib/tests/validate.tftest.hcl exists but the template was missing from the validate.yml matrix, so terraform validate and terraform test never ran for it in CI. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 63c599d..99012bd 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - template: [user-defined-web, drupal-core, freeform] + template: [user-defined-web, drupal-core, drupal-contrib, freeform] fail-fast: false steps: - uses: actions/checkout@v6 From 96ad3f77002d6bf576f7d61c28491c2926a00aa8 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Thu, 7 May 2026 11:17:23 -0600 Subject: [PATCH 2/2] fix(ci): run drupal integration tests on every push to main Both drupal-integration-test and drupal-contrib-integration-test had paths: filters on their push trigger, so they only fired when their respective template dirs changed. Merges touching image/, scripts/, .github/, or VERSION silently skipped them. The pull_request trigger already had no path filter, so this restores symmetry: integration tests now run on every push to main, matching PR behavior. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/drupal-contrib-integration-test.yml | 4 +--- .github/workflows/drupal-integration-test.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/drupal-contrib-integration-test.yml b/.github/workflows/drupal-contrib-integration-test.yml index d1498b2..b7f97c0 100644 --- a/.github/workflows/drupal-contrib-integration-test.yml +++ b/.github/workflows/drupal-contrib-integration-test.yml @@ -5,7 +5,7 @@ name: Drupal Contrib Integration Tests # # Two jobs: # contrib-plain — matrix of known modules on D11, runs on every -# push to drupal-contrib/** and nightly +# push to main and nightly # contrib-issue-fork — single workspace using a real drupal.org contrib issue # fork, runs nightly only # @@ -35,8 +35,6 @@ on: - cron: '0 5 * * *' push: branches: [main] - paths: - - 'drupal-contrib/**' pull_request: workflow_dispatch: inputs: diff --git a/.github/workflows/drupal-integration-test.yml b/.github/workflows/drupal-integration-test.yml index 1e97fb2..8bdd3f2 100644 --- a/.github/workflows/drupal-integration-test.yml +++ b/.github/workflows/drupal-integration-test.yml @@ -5,7 +5,7 @@ name: Drupal Integration Tests # # Two jobs: # drupal-plain — matrix of D11 and D12, no issue fork, runs on every -# push to drupal-core/** and nightly +# push to main and nightly # drupal-issue-fork — single workspace using a real drupal.org issue fork, # runs nightly only # @@ -40,8 +40,6 @@ on: - cron: '0 4 * * *' push: branches: [main] - paths: - - 'drupal-core/**' pull_request: workflow_dispatch: inputs: