Skip to content

actions/checkout: manually fetch ci/pinned.json patch#482470

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

actions/checkout: manually fetch ci/pinned.json patch#482470
MattSturgeon merged 1 commit into
NixOS:masterfrom
MattSturgeon:ci-fix-checkout-ci-pinned

Conversation

@MattSturgeon

@MattSturgeon MattSturgeon commented Jan 21, 2026

Copy link
Copy Markdown
Contributor

#480395 does not seem to be enough to resolve CI issues for #480141, yet. Despite testing #480395 thoroughly, it seems that in #480141 we run into issues with shallow clones, thin fetch-packs, and missing base objects:

fatal: pack has 2888 unresolved deltas
fatal: fetch-pack: invalid index-pack output
128
Error: Unhandled error: 128

In a shallow clone, git fetch may fail to apply thin packs due to missing base objects.

We typically don't notice this with first-parent commits and prospective merge commits, but it seems fairly common with arbitrary PR-branch commits.

In this instance we don't need the full commit data, we only need to apply its diff as a patch. So fetch the diff from GitHub's API and apply using git apply.

This partially reverts commit 4787f35 from #480395

Things done

@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 labels Jan 21, 2026
@MattSturgeon MattSturgeon force-pushed the ci-fix-checkout-ci-pinned branch 2 times, most recently from 5dcda20 to 99117d5 Compare January 21, 2026 23:46
In a shallow clone, `git fetch` may fail to apply thin packs due to
missing base objects.

We typically don't notice this with first-parent commits and prospective
merge commits, but it seems fairly common with arbitrary PR-branch
commits.

In this instance we don't need the full commit data, we only need to
apply its diff as a patch. So fetch the diff from GitHub's API and apply
using `git apply`.

This partially reverts commit 4787f35
Comment thread .github/actions/checkout/action.yml Outdated
@MattSturgeon MattSturgeon force-pushed the ci-fix-checkout-ci-pinned branch from 99117d5 to 79f6bf1 Compare January 22, 2026 00:34
@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 22, 2026
@MattSturgeon MattSturgeon added this pull request to the merge queue Jan 22, 2026
Merged via the queue into NixOS:master with commit 2ddfc79 Jan 22, 2026
46 checks passed
@MattSturgeon MattSturgeon deleted the ci-fix-checkout-ci-pinned branch January 22, 2026 00:43
@MattSturgeon

This comment was marked as resolved.

@nixpkgs-ci

nixpkgs-ci Bot commented Jan 22, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-25.11:

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 8.has: port to stable This PR already has a backport to the stable release. 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.

2 participants