Skip to content

github/labeler: fix auto-tag backport for .github/actions#482510

Merged
MattSturgeon merged 1 commit into
NixOS:masterfrom
MattSturgeon:ci-fix-actions-backport
Jan 22, 2026
Merged

github/labeler: fix auto-tag backport for .github/actions#482510
MattSturgeon merged 1 commit into
NixOS:masterfrom
MattSturgeon:ci-fix-actions-backport

Conversation

@MattSturgeon

Copy link
Copy Markdown
Contributor

As observed in #482470 (comment), .github/actions/* does not match deeply nested files like .github/actions/checkout/action.yml. Instead, we need a recursive glob like **/*.

Things done

.github/actions/* does not match deeply nested files like
.github/actions/checkout/action.yml

Instead, we need a recursive glob like **/*
@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. 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 backport release-25.11 labels Jan 22, 2026
@qweered

qweered commented Jan 22, 2026

Copy link
Copy Markdown
Contributor

Cant we just match everything inside .github?

@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 22, 2026
@MattSturgeon

Copy link
Copy Markdown
Contributor Author

Cant we just match everything inside .github?

Maybe, but I'd rather consider that in a dedicated PR.

The primary intent of the auto-tag backport is keeping CI consistent across all supported branches. A secondary benefit is having all changes backported makes conflicts less likely in future backports.

However there may still be some non-ci stuff that is branch-specific in .github/. Also, things like issue forms and PR templates have no effect outside of the default branch.

@MattSturgeon MattSturgeon added this pull request to the merge queue Jan 22, 2026
Merged via the queue into NixOS:master with commit 65f4958 Jan 22, 2026
32 checks passed
@MattSturgeon MattSturgeon deleted the ci-fix-actions-backport branch January 22, 2026 02:34
@nixpkgs-ci

nixpkgs-ci Bot commented Jan 22, 2026

Copy link
Copy Markdown
Contributor

Backport failed for release-25.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.11
git worktree add -d .worktree/backport-482510-to-release-25.11 origin/release-25.11
cd .worktree/backport-482510-to-release-25.11
git switch --create backport-482510-to-release-25.11
git cherry-pick -x cbf9173b1792790683dc19c592a298d224d12e15

@MattSturgeon

Copy link
Copy Markdown
Contributor Author

Backport failed for release-25.11, because it was unable to cherry-pick the commit(s).

Ah, I never got round to syncing unbackported labeling changes from master... 🫣

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants