Skip to content

[Backport release-25.05] ci/eval: fix local comparison with baseline#441831

Merged
wolfgangwalther merged 1 commit intorelease-25.05from
backport-441746-to-release-25.05
Sep 10, 2025
Merged

[Backport release-25.05] ci/eval: fix local comparison with baseline#441831
wolfgangwalther merged 1 commit intorelease-25.05from
backport-441746-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Copy Markdown
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Sep 10, 2025

Bot-based backport to release-25.05, triggered by a label in #441746.

  • 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.

Due to how we pass in existing store paths via CLI arguments for the
diff and combine scripts, Nix didn't register a dependency on the store
paths properly. This meant that some of the derivations that were built,
didn't have the right store paths made available in the sandbox -
leading to all kinds of "not found" errors.

We worked around this in CI by resolving the symlinks to the nix store
beforehand. We tried to work around this locally by storing the nix
store path in BASELINE, but this didn't fully work. By explicitly
registering these store paths as dependencies, this should work across
the board - without any magic required by the caller.

(cherry picked from commit 45a765a)
@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 Sep 10, 2025
@wolfgangwalther wolfgangwalther merged commit 4bed3c8 into release-25.05 Sep 10, 2025
55 of 60 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-441746-to-release-25.05 branch September 10, 2025 17:32
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.

1 participant