Skip to content

[Backport release-25.11] workflows/eval: evaluate ci/pinned.json changes at their commit#482087

Merged
MattSturgeon merged 2 commits into
release-25.11from
backport-480395-to-release-25.11
Jan 20, 2026
Merged

[Backport release-25.11] workflows/eval: evaluate ci/pinned.json changes at their commit#482087
MattSturgeon merged 2 commits into
release-25.11from
backport-480395-to-release-25.11

Conversation

@nixpkgs-ci

@nixpkgs-ci nixpkgs-ci Bot commented Jan 20, 2026

Copy link
Copy Markdown
Contributor

Bot-based backport to release-25.11, triggered by a label in #480395.

Before merging, ensure that this backport is acceptable for the release.

Even as a non-committer, if you find that it is not acceptable, leave a comment.

Tip

If you maintain all packages touched by this pull request, and they are all located under pkgs/by-name/*, you can comment @NixOS/nixpkgs-merge-bot merge to automatically merge this PR using the nixpkgs-merge-bot.

MattSturgeon and others added 2 commits January 20, 2026 21:46
When testVersions is enabled, the version matrix check now identifies
the specific commit that modified ci/pinned.json, rather than evaluating
the full PR. This allows formatting changes and other modifications to
coexist in the same PR without affecting the hash consistency check.

The workflow now:
- Adds headSha input to compare PR commits against target
- Finds the single commit that touched ci/pinned.json
- Errors if multiple commits modify it (to ensure clear attribution)
- Passes the bump commit to the checkout action for isolated evaluation
- Reports which commit was evaluated in the summary

The actual cherry-pick and pinned checkout handling is delegated to
the checkout action via the new `untrusted-pin-bump` input.

Co-Authored-By: Matt Sturgeon <matt@sturgeon.me.uk>
(cherry picked from commit 8c4f3d3)
@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 4.workflow: backport This targets a stable branch 6.topic: policy discussion Discuss policies to work in and around Nixpkgs labels Jan 20, 2026
@MattSturgeon MattSturgeon added this pull request to the merge queue Jan 20, 2026
Merged via the queue into release-25.11 with commit cf991c0 Jan 20, 2026
67 checks passed
@MattSturgeon MattSturgeon deleted the backport-480395-to-release-25.11 branch January 20, 2026 22:22
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 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.

2 participants