1
0
Fork 0
mirror of https://github.com/NixOS/hydra.git synced 2024-10-18 17:02:28 -04:00

hydra-eval-jobs: Pass all inputs as 'inputs' arg.

If there is no input named 'inputs', hydra-eval-jobs now passes in a set
of lists, where each attribute corresponds to an input defined in the
jobset specification and each list element is a different input alt, as
an argument named 'inputs'.

Among other things, this allows for generic hydra expressions to be
shared amongst projects with similar structures but different sets of
specific inputs.
This commit is contained in:
Shea Levy 2015-08-04 07:54:24 -04:00
parent deee99b518
commit 4d967dd17a

View file

@ -253,16 +253,28 @@ int main(int argc, char * * argv)
EvalState state(searchPath);
AutoArgs autoArgs;
Value * inputsSet = state.allocValue();
state.mkAttrs(*inputsSet, autoArgs_.size());
for (auto & i : autoArgs_) {
Symbol inputName = state.symbols.create(i.first);
Value * inputAttr = state.allocAttr(*inputsSet, inputName);
state.mkList(*inputAttr, i.second.size());
int altIndex = 0;
for (auto & j : i.second) {
Value * v = state.allocValue();
if (j[0] == 'E')
state.eval(state.parseExprFromString(string(j, 1), absPath(".")), *v);
else
mkString(*v, string(j, 1));
autoArgs[state.symbols.create(i.first)].push_back(v);
autoArgs[inputName].push_back(v);
inputAttr->list.elems[altIndex++] = v;
}
}
Symbol sInputs = state.symbols.create("inputs");
if (autoArgs.find(sInputs) == autoArgs.end()) {
inputsSet->attrs->sort();
autoArgs[sInputs].push_back(inputsSet);
}
store = openStore();