Skip to content

Revert "ci/compare: Bring back nix stats comparison" #403448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infinisil merged 1 commit into from
May 1, 2025
Merged

Revert "ci/compare: Bring back nix stats comparison" #403448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 0 additions & 141 deletions ci/eval/compare/cmp-stats.py
View file
Open in desktop

This file was deleted.

50 changes: 4 additions & 46 deletions ci/eval/compare/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
jq,
runCommand,
writeText,
python3,
...
}:
{
Expand Down Expand Up @@ -126,59 +125,18 @@ let
in
runCommand "compare"
{
nativeBuildInputs = [
jq
(python3.withPackages (
ps: with ps; [
numpy
pandas
scipy
]
))

];
nativeBuildInputs = [ jq ];
maintainers = builtins.toJSON maintainers;
passAsFile = [ "maintainers" ];
env = {
BEFORE_DIR = "${beforeResultDir}";
AFTER_DIR = "${afterResultDir}";
};
}
''
mkdir $out

cp ${changed-paths} $out/changed-paths.json


if jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
# Chunks have changed between revisions
# We cannot generate a performance comparison
{
echo
echo "# Performance comparison"
echo
echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')"
echo
echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
echo
} >> $out/step-summary.md

python3 ${./cmp-stats.py} >> $out/step-summary.md

else
# Package chunks are the same in both revisions
# We can use the to generate a performance comparison
{
echo
echo "# Performance Comparison"
echo
echo "Performance stats were skipped because the package sets differ between the two revisions."
echo
echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
} >> $out/step-summary.md
fi

jq -r -f ${./generate-step-summary.jq} < ${changed-paths} >> $out/step-summary.md
jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md

cp "$maintainersPath" "$out/maintainers.json"

# TODO: Compare eval stats
''
2 changes: 0 additions & 2 deletions ci/eval/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
nixVersions,
jq,
sta,
python3,
}:

let
Expand Down Expand Up @@ -271,7 +270,6 @@ let
runCommand
writeText
supportedSystems
python3
;
};

Expand Down
Loading