lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

hydra-queue-runner: adjust for Lix generators related changes

Browse source
This commit is contained in:
Pierre Bourdon 2024-07-16 04:35:29 +02:00
parent 1fbfed8162
commit 6195cec6a3
Signed by: delroth
GPG key ID: 6FB80DCD84DA0F1C
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hydra-queue-runner/build-remote.cc
View file

@ -121,7 +121,7 @@ static void copyClosureTo(
the remote host to substitute missing paths. */ the remote host to substitute missing paths. */
// FIXME: substitute output pollutes our build log // FIXME: substitute output pollutes our build log
conn.to << ServeProto::Command::QueryValidPaths << 1 << useSubstitutes; conn.to << ServeProto::Command::QueryValidPaths << 1 << useSubstitutes;
ServeProto::write(destStore, conn, closure); conn.to << ServeProto::write(destStore, conn, closure);
conn.to.flush(); conn.to.flush();
/* Get back the set of paths that are already valid on the remote /* Get back the set of paths that are already valid on the remote
@ -359,7 +359,7 @@ static std::map<StorePath, ValidPathInfo> queryPathInfos(
/* Get info about each output path. */ /* Get info about each output path. */
std::map<StorePath, ValidPathInfo> infos; std::map<StorePath, ValidPathInfo> infos;
conn.to << ServeProto::Command::QueryPathInfos; conn.to << ServeProto::Command::QueryPathInfos;
ServeProto::write(localStore, conn, outputs); conn.to << ServeProto::write(localStore, conn, outputs);
conn.to.flush(); conn.to.flush();
while (true) { while (true) {
auto storePathS = readString(conn.from); auto storePathS = readString(conn.from);

2
src/hydra-queue-runner/build-result.cc
View file

@ -36,7 +36,7 @@ BuildOutput getBuildOutput(
printInfo("fetching NAR contents of '%s'...", outputS); printInfo("fetching NAR contents of '%s'...", outputS);
auto source = sinkToSource([&](Sink & sink) auto source = sinkToSource([&](Sink & sink)
{ {
store->narFromPath(output, sink); sink << store->narFromPath(output);
}); });
extractNarData(*source, outputS, narMembers); extractNarData(*source, outputS, narMembers);
} }

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

@ -328,7 +328,6 @@ struct Machine : nix::Machine
operator nix::ServeProto::WriteConn () operator nix::ServeProto::WriteConn ()
{ {
return { return {
.to = to,
.version = remoteVersion, .version = remoteVersion,
}; };
} }