ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Eelco Dolstra
2020-10-18 21:01:06 +02:00
parent deb9b68afd
commit 6cd2bb6954
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/hydra-eval-jobs/hydra-eval-jobs.cc
View File

@@ -14,6 +14,7 @@
#include "flake/flake.hh" #include "flake/flake.hh"
#include "attr-path.hh" #include "attr-path.hh"
#include "derivations.hh" #include "derivations.hh"
#include "local-fs-store.hh"
#include "hydra-config.hh" #include "hydra-config.hh"

10
src/hydra-queue-runner/build-remote.cc
View File

@@ -95,12 +95,12 @@ static void copyClosureTo(std::timed_mutex & sendMutex, ref<Store> destStore,
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
to << cmdQueryValidPaths << 1 << useSubstitutes; to << cmdQueryValidPaths << 1 << useSubstitutes;
writeStorePaths(*destStore, to, closure); worker_proto::write(*destStore, to, closure);
to.flush(); 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
host. */ host. */
auto present = readStorePaths<StorePathSet>(*destStore, from); auto present = worker_proto::read(*destStore, from, Phantom<StorePathSet> {});
if (present.size() == closure.size()) return; if (present.size() == closure.size()) return;
@@ -315,7 +315,7 @@ void State::buildRemote(ref<Store> destStore,
if (sendDerivation) { if (sendDerivation) {
to << cmdBuildPaths; to << cmdBuildPaths;
writeStorePaths(*localStore, to, {step->drvPath}); worker_proto::write(*localStore, to, {step->drvPath});
} else { } else {
to << cmdBuildDerivation << localStore->printStorePath(step->drvPath); to << cmdBuildDerivation << localStore->printStorePath(step->drvPath);
writeDerivation(to, *localStore, basicDrv); writeDerivation(to, *localStore, basicDrv);
@@ -444,13 +444,13 @@ void State::buildRemote(ref<Store> destStore,
std::map<StorePath, ValidPathInfo> infos; std::map<StorePath, ValidPathInfo> infos;
size_t totalNarSize = 0; size_t totalNarSize = 0;
to << cmdQueryPathInfos; to << cmdQueryPathInfos;
writeStorePaths(*localStore, to, outputs); worker_proto::write(*localStore, to, outputs);
to.flush(); to.flush();
while (true) { while (true) {
auto storePathS = readString(from); auto storePathS = readString(from);
if (storePathS == "") break; if (storePathS == "") break;
readString(from); // deriver readString(from); // deriver
auto references = readStorePaths<StorePathSet>(*localStore, from); auto references = worker_proto::read(*localStore, from, Phantom<StorePathSet> {});
readLongLong(from); // download size readLongLong(from); // download size
auto narSize = readLongLong(from); auto narSize = readLongLong(from);
auto narHash = Hash::parseAny(readString(from), htSHA256); auto narHash = Hash::parseAny(readString(from), htSHA256);