ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Declarative projects: Include the fetch info for the declarative input in the project eval

Browse source
This commit is contained in:
Shea Levy 2016-04-12 14:35:57 -04:00
parent 4392d3e21d
commit aa7cc6d599
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/script/hydra-evaluator
View file

@ -103,6 +103,7 @@ sub checkJobsetWrapped {
my ($jobset) = @_; my ($jobset) = @_;
my $project = $jobset->project; my $project = $jobset->project;
my $jobsetsJobset = length($project->declfile) && $jobset->name eq ".jobsets"; my $jobsetsJobset = length($project->declfile) && $jobset->name eq ".jobsets";
my $inputInfo = {};
if ($jobsetsJobset) { if ($jobsetsJobset) {
my @declInputs = fetchInput($plugins, $db, $project, $jobset, "decl", $project->decltype, $project->declvalue, 0); my @declInputs = fetchInput($plugins, $db, $project, $jobset, "decl", $project->decltype, $project->declvalue, 0);
my $declInput = @declInputs[0] or die "cannot find the input containing the declarative project specification\n"; my $declInput = @declInputs[0] or die "cannot find the input containing the declarative project specification\n";
@ -118,8 +119,8 @@ sub checkJobsetWrapped {
die "Declarative specification file $declFile not valid JSON: $@\n" if $@; die "Declarative specification file $declFile not valid JSON: $@\n" if $@;
updateDeclarativeJobset($db, $project, ".jobsets", $declSpec); updateDeclarativeJobset($db, $project, ".jobsets", $declSpec);
$jobset->discard_changes; $jobset->discard_changes;
$inputInfo->{"declInput"} = [ $declInput ];
} }
my $inputInfo = {};
my $exprType = $jobset->nixexprpath =~ /.scm$/ ? "guile" : "nix"; my $exprType = $jobset->nixexprpath =~ /.scm$/ ? "guile" : "nix";
# Fetch all values for all inputs. # Fetch all values for all inputs.