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

Fix build

Browse source 
(cherry picked from commit 639c660abf)
This commit is contained in:
Eelco Dolstra 2020-02-15 14:54:21 +01:00
parent 5308e514ad
commit adf61e5cf8
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/hydra-queue-runner/queue-monitor.cc
View file

@ -102,9 +102,9 @@ bool State::getQueuedBuilds(Connection & conn,
if (id > newLastBuildId) newLastBuildId = id; if (id > newLastBuildId) newLastBuildId = id;
if (builds_->count(id)) continue; if (builds_->count(id)) continue;
auto build = std::make_shared<Build>(); auto build = std::make_shared<Build>(
localStore->parseStorePath(row["drvPath"].as<string>()));
build->id = id; build->id = id;
build->drvPath = localStore->parseStorePath(row["drvPath"].as<string>());
build->projectName = row["project"].as<string>(); build->projectName = row["project"].as<string>();
build->jobsetName = row["jobset"].as<string>(); build->jobsetName = row["jobset"].as<string>();
build->jobName = row["job"].as<string>(); build->jobName = row["job"].as<string>();
@ -402,8 +402,7 @@ Step::ptr State::createStep(ref<Store> destStore,
/* If it doesn't exist, create it. */ /* If it doesn't exist, create it. */
if (!step) { if (!step) {
step = std::make_shared<Step>(); step = std::make_shared<Step>(drvPath.clone());
step->drvPath = drvPath.clone();
isNew = true; isNew = true;
} }

6
src/hydra-queue-runner/state.hh
View file

@ -136,6 +136,9 @@ struct Build
std::atomic_bool finishedInDB{false}; std::atomic_bool finishedInDB{false};
Build(nix::StorePath && drvPath) : drvPath(std::move(drvPath))
{ }
std::string fullJobName() std::string fullJobName()
{ {
return projectName + ":" + jobsetName + ":" + jobName; return projectName + ":" + jobsetName + ":" + jobName;
@ -201,6 +204,9 @@ struct Step
nix::Sync<State> state; nix::Sync<State> state;
Step(nix::StorePath && drvPath) : drvPath(std::move(drvPath))
{ }
~Step() ~Step()
{ {
//printMsg(lvlError, format("destroying step %1%") % drvPath); //printMsg(lvlError, format("destroying step %1%") % drvPath);