[TEST] workflows/eval: evaluate ci/pinned.json changes at their commit#480436
Closed
MattSturgeon wants to merge 4 commits into
Closed
[TEST] workflows/eval: evaluate ci/pinned.json changes at their commit#480436MattSturgeon wants to merge 4 commits into
MattSturgeon wants to merge 4 commits into
Conversation
12 tasks
nixpkgs-ci
Bot
added
10.rebuild-darwin: 0
MattSturgeon
force-pushed
the
test-ci-eval-workflow
branch
3 times, most recently
from
d40b651 to
cd0b73f
Compare
nixpkgs-ci
Bot
added
10.rebuild-linux: 11-100
MattSturgeon
force-pushed
the
test-ci-eval-workflow
branch
10 times, most recently
from
a5cc154 to
86f3f37
Compare
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
For testing CI...
MattSturgeon
force-pushed
the
test-ci-eval-workflow
branch
from
86f3f37 to
6adef4f
Compare
nixpkgs-ci
Bot
added
the
2.status: merge conflict
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR tests #480395 in production
EDIT: later used to test #482470 too.
Outdated notes
Test 1 (43b2198) should "fail":
This failed as expected:
Test 2 (cd0b73f) should be "ok":
Attempt 1
This failed unexpectedly, finding an additional commit that is not part of this PR:
It lists d40b651 from this PR and 05d622c the merge commit. See https://github.com/NixOS/nixpkgs/pull/480395/changes#r2695743434.
Attempt 2 (with the PR updated to use HEAD SHA) seems to work:
https://github.com/NixOS/nixpkgs/actions/runs/21045169842/job/60517468599?pr=480436#step:4:61
However the
reportjob unexpectedly finds changed outPaths:https://github.com/NixOS/nixpkgs/actions/runs/21045169842/job/60525175036?pr=480436#step:3:82
Despite eval's comparison reporting zero changes.
Test 3 (827ad37) should be "ok":
Attempt 1: fails unexpectedly:
versionsfinds the correct commit:https://github.com/NixOS/nixpkgs/actions/runs/21045403802/job/60518361251?pr=480436#step:4:61
reportcomplains that 827ad37's parent (cd0b73f) has rebuilds:https://github.com/NixOS/nixpkgs/actions/runs/21045403802/job/60519795391?pr=480436#step:3:82