Skip to content

CI: Add merge queue support and fix JS lint swallowing#114

Merged
kraftbj merged 2 commits into
trunkfrom
ci/merge-queue-and-lint-fix
Apr 1, 2026
Merged

CI: Add merge queue support and fix JS lint swallowing#114
kraftbj merged 2 commits into
trunkfrom
ci/merge-queue-and-lint-fix

Conversation

@kraftbj
Copy link
Copy Markdown
Collaborator

@kraftbj kraftbj commented Apr 1, 2026

Summary

  • Adds merge_group trigger so the workflow runs in the GitHub merge queue
  • PHP tests run only bookend versions (7.4, 8.2) on PRs for faster feedback; all versions (7.4, 8.0, 8.1, 8.2) run on merge queue and trunk push
  • Adds a CI gate job that aggregates all job results into a single required status check
  • Removes continue-on-error: true from the JS lint step so lint failures are no longer silently swallowed
  • Removes the dead modernize/v2 branch from the push trigger

After merging

Update branch protection for trunk:

  • Set CI as the sole required status check
  • Remove any individual job names that were previously required

Test plan

  • Verify this PR runs PHP tests for only 7.4 and 8.2
  • Verify JS lint failures would block the CI gate job
  • After merging, verify merge queue runs all four PHP versions

- Add merge_group trigger for GitHub merge queue integration
- Run PHP tests against only bookend versions (7.4, 8.2) on PRs for
  faster feedback; run all versions on merge queue and trunk push
- Add CI gate job as a single required status check
- Remove continue-on-error from JS lint step so failures are reported
- Remove dead modernize/v2 branch from push trigger
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the repository’s main CI workflow to better support GitHub’s merge queue and to ensure lint/test failures reliably fail the workflow via a single required check.

Changes:

  • Add merge_group trigger so CI runs for merge queue evaluations.
  • Adjust PHP test matrix to run only PHP 7.4 and 8.2 on PRs, while running 7.4/8.0/8.1/8.2 on push and merge_group.
  • Add an aggregate CI gate job and remove continue-on-error from the JS lint step so failures are not swallowed.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Add .eslintrc.js extending the WordPress config with JSX and DOM
types (Document, Element, KeyboardEvent, MouseEvent) registered as
defined types for the jsdoc/no-undefined-types rule.

These errors were previously hidden by continue-on-error on the
lint step.
@kraftbj kraftbj added this pull request to the merge queue Apr 1, 2026
Merged via the queue into trunk with commit 9b2f062 Apr 1, 2026
6 checks passed
@kraftbj kraftbj deleted the ci/merge-queue-and-lint-fix branch April 1, 2026 19:59
@kraftbj kraftbj mentioned this pull request May 4, 2026
3 tasks
@kraftbj kraftbj added this to the 2.1.0 milestone May 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants