Skip to content

chore(ci): enable GitHub merge queues [WPB-23415] #20387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
screendriver merged 1 commit into from
Feb 11, 2026
+22 −3
Merged

chore(ci): enable GitHub merge queues [WPB-23415] #20387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
# we want to run the CI on every PR targetting those branches
branches: [master, dev, release/*]

merge_group:
branches: [master, dev, release/*]

push:
# We also run CI on dev in order to update the coverage monitoring
branches: [dev]
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/dependency-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on: [pull_request]
on:
pull_request:
merge_group:

permissions:
contents: read
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/jira-lint-and-link.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@ name: Link and Lint PR with Jira Ticket Number
on:
pull_request:
types: [opened, edited, synchronize]
merge_group:
branches: [dev]
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

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

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.

Suggested change
branches: [dev]
branches: [master, dev, release/*]

Copilot uses AI. Check for mistakes.
Copy link
Collaborator Author

@screendriver screendriver Feb 11, 2026

Choose a reason for hiding this comment

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

branches: [dev] is intentional here:

  • add-jira-description is only required on dev (per current branch protection).
  • master has 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.

jobs:
add-jira-description:
# avoid triggering this action on dependabot PRs
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'otto-the-bot' }}
# On merge_group there is no pull request payload; keep the required check green there.
if: ${{ github.event_name == 'merge_group' || (github.actor != 'dependabot[bot]' && github.actor != 'otto-the-bot') }}
runs-on: ubuntu-latest
steps:
- name: Skip on merge queue
if: ${{ github.event_name == 'merge_group' }}
run: echo "Skipping Jira pull request description validation on merge queue."

- uses: cakeinpanic/jira-description-action@master
if: ${{ github.event_name == 'pull_request' }}
name: jira-description-action
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/semantic-commit-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: 'Semantic Commit Linting of PR titles'
on:
pull_request_target:
types: [opened, edited, synchronize]
merge_group:
branches: [master, dev, release/*]

permissions:
statuses: write
Expand All @@ -11,9 +13,14 @@ jobs:
semantic-commit-pr-title-lint:
runs-on: ubuntu-latest
steps:
- name: Skip on merge queue
if: ${{ github.event_name == 'merge_group' }}
run: echo "Skipping semantic PR title lint on merge queue."

# Please look up the latest version from
# https://github.com/amannn/action-semantic-pull-request/releases
- name: Run Semantic Commint Linter
if: ${{ github.event_name == 'pull_request_target' }}
uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down