1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 09:36:20 +09:00

workflows/eval: consistently avoid "result" in arguments

Everything is a result, especially when nix-build uses "result" as its
default output. This becomes confusing, when re-wiring the different
parts later.

Thus, consistently name those things after some of their properties and
avoid the term result.
This commit is contained in:
Wolfgang Walther 2025-05-18 21:21:44 +02:00
parent 0e1c284b13
commit b2579d36ff
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
3 changed files with 31 additions and 30 deletions

View file

@ -7,8 +7,8 @@
python3,
}:
{
beforeResultDir,
afterResultDir,
beforeDir,
afterDir,
touchedFilesJson,
githubAuthorId,
byName ? false,
@ -20,7 +20,7 @@ let
---
Inputs:
- beforeResultDir, afterResultDir: The evaluation result from before and after the change.
- beforeDir, afterDir: The evaluation result from before and after the change.
They can be obtained by running `nix-build -A ci.eval.full` on both revisions.
---
@ -83,8 +83,8 @@ let
data = builtins.unsafeDiscardStringContext raw;
in
builtins.fromJSON data;
beforeAttrs = getAttrs beforeResultDir;
afterAttrs = getAttrs afterResultDir;
beforeAttrs = getAttrs beforeDir;
afterAttrs = getAttrs afterDir;
# Attrs
# - keys: "added", "changed" and "removed"
@ -149,8 +149,8 @@ runCommand "compare"
maintainers = builtins.toJSON maintainers;
passAsFile = [ "maintainers" ];
env = {
BEFORE_DIR = "${beforeResultDir}";
AFTER_DIR = "${afterResultDir}";
BEFORE_DIR = "${beforeDir}";
AFTER_DIR = "${afterDir}";
};
}
''

View file

@ -193,9 +193,9 @@ let
combine =
{
resultsDir,
evalDir,
}:
runCommand "combined-result"
runCommand "combined-eval"
{
nativeBuildInputs = [
jq
@ -205,11 +205,11 @@ let
mkdir -p $out
# Combine output paths from all systems
cat ${resultsDir}/*/paths.json | jq -s add > $out/outpaths.json
cat ${evalDir}/*/paths.json | jq -s add > $out/outpaths.json
mkdir -p $out/stats
for d in ${resultsDir}/*; do
for d in ${evalDir}/*; do
cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")
done
'';
@ -225,8 +225,8 @@ let
quickTest ? false,
}:
let
results = symlinkJoin {
name = "results";
evals = symlinkJoin {
name = "evals";
paths = map (
evalSystem:
singleSystem {
@ -236,7 +236,7 @@ let
};
in
combine {
resultsDir = results;
evalDir = evals;
};
in