Skip to content

[backport release-25.11] github/labeler: backport changes to labeler-no-sync#482540

Merged
MattSturgeon merged 4 commits into
NixOS:release-25.11from
MattSturgeon:backport-github-labeler
Jan 22, 2026
Merged

[backport release-25.11] github/labeler: backport changes to labeler-no-sync#482540
MattSturgeon merged 4 commits into
NixOS:release-25.11from
MattSturgeon:backport-github-labeler

Conversation

@MattSturgeon

@MattSturgeon MattSturgeon commented Jan 22, 2026

Copy link
Copy Markdown
Contributor

wolfgangwalther and others added 4 commits January 22, 2026 04:11
The labeler reads its config from the PR's base branch. Therefore, its
config files need to be kept in sync across development branches, like
other CI files.

(cherry picked from commit 20ab35a)
.github/actions/* does not match deeply nested files like
.github/actions/checkout/action.yml

Instead, we need a recursive glob like **/*

(cherry picked from commit cbf9173)

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 46cb8ec and original e30855a may warrant inspection.

Show diff
@@ Commit message
 
     E.g. #472010, #472185
 
+    (cherry picked from commit e30855a4d4bdd17e496f3d375064a181bc42d822)
+
  ## .github/labeler-no-sync.yml ##
 @@
                - nixos/doc/**/*
  
- "backport release-25.05":
--  - any:
-+  - all:
-       - changed-files:
-           - any-glob-to-any-file:
-               - .github/actions/*
-               - .github/workflows/*
-               - ci/**/*.*
-               - maintainers/github-teams.json
-+      - base-branch: ['master']
- 
  "backport release-25.11":
 -  - any:
 +  - all:

Warning

Difference between 81b3a92 and original 20ab35a may warrant inspection.

Show diff
@@ Commit message
     config files need to be kept in sync across development branches, like
     other CI files.
 
+    (cherry picked from commit 20ab35ae0cf1517124e9d490c1d25838e31483c7)
+
  ## .github/labeler-no-sync.yml ##
 @@
            - any-glob-to-any-file:
@@ .github/labeler-no-sync.yml
                - ci/**/*.*
                - maintainers/github-teams.json
        - base-branch: ['master']
-@@
-           - any-glob-to-any-file:
-               - .github/actions/*
-               - .github/workflows/*
-+              - .github/labeler*.yml
-               - ci/**/*.*
-               - maintainers/github-teams.json
-       - base-branch: ['master']

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 4.workflow: backport This targets a stable branch 6.topic: policy discussion Discuss policies to work in and around Nixpkgs labels Jan 22, 2026
@MattSturgeon MattSturgeon requested a review from a team January 22, 2026 04:39
@MattSturgeon MattSturgeon dismissed github-actions[bot]’s stale review January 22, 2026 13:44

Diffs correctly missing 25.05 stuff

@MattSturgeon MattSturgeon added this pull request to the merge queue Jan 22, 2026
Merged via the queue into NixOS:release-25.11 with commit 060c908 Jan 22, 2026
37 of 39 checks passed
@MattSturgeon MattSturgeon deleted the backport-github-labeler branch January 22, 2026 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants