chore(ci): enable GitHub merge queues [WPB-23415] #20387
Conversation
screendriver
force-pushed
the
merge-queue
branch
from
67fa111 to
0d211bb
Compare
There was a problem hiding this comment.
Pull request overview
This PR enables GitHub merge queues for the repository, allowing PRs to be automatically merged without manual rebasing. The changes add merge_group triggers to four CI workflows, with appropriate conditional logic to skip PR-specific steps when running in the merge queue context.
Changes:
- Added merge_group triggers to CI workflows to enable merge queue functionality
- Added conditional logic to skip PR-specific validations (semantic commit linting, Jira linking) during merge queue runs
- Maintained existing behavior for regular pull request events
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| .github/workflows/ci.yml | Added merge_group trigger for master, dev, and release/* branches |
| .github/workflows/semantic-commit-lint.yml | Added merge_group trigger with skip logic for PR title validation |
| .github/workflows/jira-lint-and-link.yml | Added merge_group trigger for dev branch only with skip logic |
| .github/workflows/dependency-review.yml | Added merge_group trigger without branch restrictions |
| pull_request: | ||
| types: [opened, edited, synchronize] | ||
| merge_group: | ||
| branches: [dev] |
There was a problem hiding this comment.
The merge_group trigger for jira-lint-and-link.yml only specifies branches: [dev], while other workflows (semantic-commit-lint.yml and ci.yml) specify branches: [master, dev, release/*]. This inconsistency means the Jira validation check won't run for merge queues targeting master or release branches, which could cause those merge queues to fail if the check is required.
Consider aligning the branches configuration to match the other workflows for consistency, unless there's a specific reason to only validate Jira requirements for the dev branch.
| branches: [dev] | |
| branches: [master, dev, release/*] |
There was a problem hiding this comment.
branches: [dev] is intentional here:
add-jira-descriptionis only required ondev(per current branch protection).masterhas no required checks.release/*currently cannot use merge queue (GitHub does not support merge queue on wildcard branch rules).
So limiting merge_group to dev avoids unnecessary runs and matches the only branch where this check matters for merge queue. If branch protection changes later and this check becomes required elsewhere, we can expand the branch list then.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #20387 +/- ##
=======================================
Coverage 45.25% 45.25%
=======================================
Files 1633 1633
Lines 40245 40245
Branches 8325 8325
=======================================
Hits 18212 18212
Misses 20105 20105
Partials 1928 1928
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
🔗 Download Full Report Artifact 🧪 Playwright Test Summary
|
Previously all pull requests needed to be rebased manually or through the GitHub web user interface. Introducing GitHub merge queues helps here with increasing development velocity.
screendriver
force-pushed
the
merge-queue
branch
from
0d211bb to
388d4e8
Compare
|
3 participants
Pull Request
Summary
Previously all pull requests needed to be rebased manually or through the GitHub user interface. Introducing GitHub merge queues, also sometimes called merge trains 🚂 , helps here with increasing development velocity.
When this pull request is merged we will have a new button that will look like this one which will take care about rebasing and merging everything.
Security Checklist (required)
Accessibility (required)
Standards Acknowledgement (required)