delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hydra-eval-jobs: Ensure we have output path if ca-derivations is disabled

Browse source 
Brought up by @thufschmitt in
https://github.com/NixOS/hydra/pull/1316#discussion_r1415111329 . This
makes this closer to what was originally there --- which just dispatched
off the experimental feature rather than the presence/absense of the
output, too.
This commit is contained in:
John Ericson 2023-12-05 11:26:26 -05:00
parent e3443cd22a
commit 069b7775c5
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -243,11 +243,16 @@ static void worker(
} }
nlohmann::json out; nlohmann::json out;
for (auto & [outputName, optOutputPath] : outputs) for (auto & [outputName, optOutputPath] : outputs) {
if (optOutputPath) if (optOutputPath) {
out[outputName] = state.store->printStorePath(*optOutputPath); out[outputName] = state.store->printStorePath(*optOutputPath);
else } else {
// See the `queryOutputs` call above; we should
// not encounter missing output paths otherwise.
assert(experimentalFeatureSettings.isEnabled(Xp::CaDerivations));
out[outputName] = ""; out[outputName] = "";
}
}
job["outputs"] = std::move(out); job["outputs"] = std::move(out);
reply["job"] = std::move(job); reply["job"] = std::move(job);
} }