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 6 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
6 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
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
2 changes: 2 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 @@ -11,6 +11,8 @@ on:
- dev
- main
- releasing/*
merge_group: # needed for merge queue
types: [checks_requested]

concurrency:
# automatically cancel the previously triggered workflows when there's a newer version
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/cicd_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,13 @@ on:
- dev
- main
- releasing/*
paths-ignore: # skip if only docs are modified
- '**.md'
- '**.rst'
- 'docs/**'
pull_request:

@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.

Removing paths-ignore means every documentation-only PR now triggers the full test matrix (min-dep across OS/Python/PyTorch combinations, full-dep, and packaging). Note that the merge_group trigger does not use path filters, so this removal is not required for merge queue support. Could you confirm the CI cost increase is intentional, and whether a lighter-weight always-required job could preserve the doc-skip behavior while still satisfying the required check?

@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.

When the doc-only PRs come through the actions don't run at all so don't get counted as passing either. This is to re-enable these until I work on a better solution involving a script to filter things and predicate actions on its output.

branches:
- dev
- main
- releasing/*
paths-ignore: # skip if only docs are modified
- '**.md'
- '**.rst'
- 'docs/**'
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.

types: [checks_requested]

concurrency:
# automatically cancel the previously triggered workflows when there's a newer version
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ on:
pull_request:
# The branches below must be a subset of the branches above
branches: [ dev ]
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 workflow is currently disabled on the repository (disabled_manually), so the merge_group trigger here will not take effect until CodeQL is re-enabled.

@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.

This is in another PR I'm working on.

types: [checks_requested]
schedule:
- cron: '18 1 * * 0'

Expand Down
Loading