Skip to content

Adding Merge Queue Support #8991

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

Open
ericspod wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

Adding Merge Queue Support #8991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93f0330
Adding Merge Queue Support
ericspod Jul 8, 2026
a84b424
Merge branch 'dev' into enable_merge_queue_actions
ericspod Jul 13, 2026
1448a43
Merge branch 'dev' into enable_merge_queue_actions
ericspod Aug 18, 2026
8f8fa8f
Remove paths-ignore
ericspod Aug 27, 2026
de36fee
Merge branch 'dev' into enable_merge_queue_actions
ericspod Aug 27, 2026
c5b6c49
Merge branch 'dev' into enable_merge_queue_actions
ericspod Sep 1, 2026
20e76cb
Merge branch 'dev' into enable_merge_queue_actions
ericspod Sep 7, 2026
6581f8b
Merge branch 'dev' into enable_merge_queue_actions
ericspod Sep 21, 2026
d284dd1
Merge branch 'dev' into enable_merge_queue_actions
ericspod Sep 28, 2026
b2e84b0
Adding branch push triggers
ericspod Sep 28, 2026
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/build_docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ on:
- dev
- main
- releasing/*
- gh-readonly-queue/*
pull_request:
branches:
- dev
- main
- releasing/*
merge_group: # needed for merge queue
types: [checks_requested]

permissions:
contents: read
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/cicd_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ on:
- dev
- main
- releasing/*
- gh-readonly-queue/*
pull_request:
branches:
- dev
- main
- releasing/*
merge_group: # needed for merge queue

@garciadias garciadias Aug 28, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This adds the merge_group trigger for the GitHub-Actions-hosted checks, but the branch protection ruleset (ID 16034365) also requires third-party checks: DCO, DeepSource (Docker/Python/Shell), and pre-commit.ci. A merge queue entry only completes when every required check reports on the gh-readonly-queue/... branch. Have these external apps been verified to support merge_group events, or will they be excluded from the merge queue's required checks? If not, enqueued PRs will wait until the queue times out.

@ericspod ericspod Sep 1, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I don't honestly know, we might have to see if it goes through or adjust our branch rules. The DCO, pre-commit, and other checks don't need to be run again in the queue, only code that's gotten through a PR is in the queue, so it would be good to exclude them.

@ericspod ericspod Sep 28, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I've added the triggers for pushes on branches matching gh-readonly-queue/* so that should cause these to work, the outstanding concerns are if pre-commit, DeepSource, and DCO will get through in the merge queue.

@ericspod ericspod Sep 28, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

If we relaxed the rules on those other tests being necessary I don't think much would be lost since a review from an owner is still require, all of which know better than to merge something failing tests.

types: [checks_requested]

permissions:
contents: read
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ name: "CodeQL Advanced"

on:
push:
branches: [ dev, main ]
branches:
- dev
- main
- gh-readonly-queue/*
pull_request:
branches: [ dev ]
merge_group: # needed for merge queue
Comment thread
ericspod marked this conversation as resolved.
types: [checks_requested]
schedule:
- cron: '0 2 * * 1' # 2AM Monday

Expand Down
Loading