1
0
Fork 0
mirror of https://github.com/NixOS/hydra.git synced 2024-10-17 16:37:26 -04:00
This commit is contained in:
RichardWarfield 2024-10-17 19:48:32 +02:00 committed by GitHub
commit 3eab6ecb64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -645,10 +645,16 @@ sub checkJobsetWrapped {
if (defined $flakeRef) { if (defined $flakeRef) {
(my $res, my $json, my $stderr) = captureStdoutStderr( (my $res, my $json, my $stderr) = captureStdoutStderr(
600, "nix", "flake", "metadata", "--refresh", "--json", "--", $flakeRef); 600, "nix", "flake", "metadata", "--refresh", "--json", "--", $flakeRef);
die "'nix flake metadata' returned " . ($res & 127 ? "signal $res" : "exit code " . ($res >> 8)) die "'nix flake metadata' returned " . ($res & 127 ? "signal $res" : "exit code " . ($res >> 8))
. ":\n" . ($stderr ? decode("utf-8", $stderr) : "(no output)\n") . ":\n" . ($stderr ? decode("utf-8", $stderr) : "(no output)\n")
if $res; if $res;
$flakeRef = decode_json($json)->{'url'}; my $decoded = decode_json($json);
my $url = $decoded->{'url'}; # Doesn't have the &submodules=1, so add it back if needed
if ($decoded->{'resolved'}->{'submodules'}) {
$url = $url . "&submodules=1";
}
$flakeRef = $url;
} }
Net::Statsd::increment("hydra.evaluator.checkouts"); Net::Statsd::increment("hydra.evaluator.checkouts");