Skip to content

Add merge queue for 26.05#256

Merged
emilazy merged 1 commit into
NixOS:mainfrom
yayayayaka:merge-queue-26.05
May 24, 2026
Merged

Add merge queue for 26.05#256
emilazy merged 1 commit into
NixOS:mainfrom
yayayayaka:merge-queue-26.05

Conversation

@yayayayaka
Copy link
Copy Markdown
Member

No description provided.

@yayayayaka yayayayaka requested a review from a team as a code owner May 24, 2026 11:19
@emilazy emilazy merged commit 977414a into NixOS:main May 24, 2026
2 checks passed
@@ -11,6 +11,7 @@
"include": [
"~DEFAULT_BRANCH",
"refs/heads/release-25.11"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
"refs/heads/release-25.11"
"refs/heads/release-25.11",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Whoops, indeed. These are applied manually anyway, which I’ve done. We apparently need an org owner to re‐export them to JSON.

@pbsds
Copy link
Copy Markdown
Member

pbsds commented May 24, 2026

It seems this field may support the fnmatch syntax, which in essence is a glob. This could be future-proofed with a release-*.* or release-[0-9][0-9].[0-9][0-9] glob.

@emilazy
Copy link
Copy Markdown
Member

emilazy commented May 24, 2026

I think we didn’t do it like that because 24.11 didn’t have the merge queue. Other rulesets here use the glob. We could presumably move over to it now. cc @NixOS/nixpkgs-ci?

@MattSturgeon
Copy link
Copy Markdown

MattSturgeon commented May 24, 2026

It seems this field may support the fnmatch syntax, which in essence is a glob.

Sadly, rulsets that enable Merge Queue are not able to target fnmatch patterns:

image

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#configuring-continuous-integration-ci-workflows-for-merge-queues

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.

5 participants