cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #139633 from edolstra/fix-metrics

Browse source 
Fix the metrics job
This commit is contained in:
Eelco Dolstra 2021-09-28 09:58:42 +02:00 committed by GitHub
commit 8b725cf898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/top-level/metrics.nix
View file

@ -9,6 +9,7 @@ runCommand "nixpkgs-metrics"
}
''
export NIX_STATE_DIR=$TMPDIR
export NIX_PAGER=
nix-store --init
mkdir -p $out/nix-support
@ -24,13 +25,11 @@ runCommand "nixpkgs-metrics"
# Redirect stdout to /dev/null to avoid hitting "Output Limit
# Exceeded" on Hydra.
nix-env.qaDrv|nix-env.qaDrvAggressive)
NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix >/dev/null ;;
NIX_SHOW_STATS=1 NIX_SHOW_STATS_PATH=stats-nix time -o stats-time "$@" >/dev/null ;;
*)
NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix ;;
NIX_SHOW_STATS=1 NIX_SHOW_STATS_PATH=stats-nix time -o stats-time "$@" ;;
esac
sed '/^warning:/d' -i stats-nix
cat stats-nix; echo; cat stats-time; echo
x=$(jq '.cpuTime' < stats-nix)

1
pkgs/top-level/release.nix
View file

@ -90,6 +90,7 @@ let
meta.description = "Release-critical builds for the Nixpkgs unstable channel";
constituents =
[ jobs.tarball
jobs.metrics
jobs.manual
jobs.lib-tests
jobs.pkgs-lib-tests