Skip to content

Commit 7e07858

Browse files
author
Callin Mullaney
committed
ci: keep release branch readiness coverage
1 parent 3bc09f7 commit 7e07858

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/scripts/release-check.cjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,9 @@ function runStaticChecks() {
265265
ensure(themeReadinessWorkflow.includes("'8.5'"), 'theme-readiness.yml should run advisory Drupal dev-branch smoke checks on PHP 8.5.');
266266
}
267267
ensure(themeReadinessWorkflow.includes('pull_request:'), 'theme-readiness.yml should run on pull requests.');
268+
ensure(themeReadinessWorkflow.includes('- 7.x'), 'theme-readiness.yml should run on pushes to 7.x while this release branch owns the workflow.');
268269
ensure(themeReadinessWorkflow.includes('- release-7'), 'theme-readiness.yml should run on pushes to release-7.');
269-
ensure(!themeReadinessWorkflow.includes('- 7.x'), 'theme-readiness.yml should not duplicate pull_request readiness runs with a 7.x push trigger.');
270+
ensure(themeReadinessWorkflow.includes('github.event.pull_request.head.ref || github.ref_name'), 'theme-readiness.yml should group duplicate push/pull_request runs by head branch.');
270271
ensure(!themeReadinessWorkflow.includes('- 6.x'), 'theme-readiness.yml should not keep the retired 6.x release branch trigger.');
271272
return `Root theme metadata and CI readiness checks align to Drupal ${supportedDrupalLines.join(', ')} via ${supportedDrupalSmokeTargets.join(', ')} smoke targets. Local smoke default: ${options.drupalVersion}.`;
272273
});

.github/workflows/theme-readiness.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ name: Theme Readiness
22

33
on:
44
pull_request:
5-
# Push coverage is for integration branches. Same-repo PR head branches are
6-
# covered by pull_request, which avoids duplicate readiness runs per commit.
5+
# Keep 7.x push coverage because this release branch owns the readiness
6+
# workflow before it lands on main.
77
push:
88
branches:
99
- main
10+
- 7.x
1011
- release-7
1112
workflow_dispatch:
1213

1314
concurrency:
14-
group: theme-readiness-${{ github.event.pull_request.number || github.ref }}
15+
group: theme-readiness-${{ github.event.pull_request.head.ref || github.ref_name }}
1516
cancel-in-progress: true
1617

1718
jobs:

0 commit comments

Comments
 (0)