Revert "hydra-eval-jobs -> nix eval-hydra-jobs"

This reverts commit 345512a6d0.
This commit is contained in:
Eelco Dolstra
2020-02-19 20:36:52 +01:00
parent cf961ac893
commit 6f1d68bda4
8 changed files with 302 additions and 19 deletions

View File

@ -330,27 +330,22 @@ sub inputsToArgs {
sub evalJobs {
my ($inputInfo, $nixExprInputName, $nixExprPath, $flakeRef) = @_;
my @cmd = (
"nix", "eval-hydra-jobs",
"--json",
"--gc-roots-dir", getGCRootsDir,
"--max-jobs", 1,
"--workers", $config->{evaluator_workers} // 1,
"--max-memory-size", $config->{evaluator_max_memory_size} // 4096,
"--builders", "",
);
my @cmd;
if (defined $flakeRef) {
push @cmd,
($flakeRef,
"--no-update-lock-file",
"--no-registries");
@cmd = ("hydra-eval-jobs",
"--flake", $flakeRef,
"--gc-roots-dir", getGCRootsDir,
"--max-jobs", 1);
} else {
my $nixExprInput = $inputInfo->{$nixExprInputName}->[0]
or die "cannot find the input containing the job expression\n";
push @cmd,
("--file", "<" . $nixExprInputName . "/" . $nixExprPath . ">",
inputsToArgs($inputInfo));
@cmd = ("hydra-eval-jobs",
"<" . $nixExprInputName . "/" . $nixExprPath . ">",
"--gc-roots-dir", getGCRootsDir,
"--max-jobs", 1,
inputsToArgs($inputInfo));
}
if (defined $ENV{'HYDRA_DEBUG'}) {