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

Merge pull request #1316 from NixOS/ca-derivations-prep

Browse Source 
Prepare for CA derivation support with lower impact changes
This commit is contained in:
John Ericson
2024-01-24 18:12:42 -05:00
committed by GitHub
parent d02e20a4c1 588a0c5269
commit d45e14fd43
8 changed files with 167 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hydra-queue-runner/state.hh
View File

@@ -525,7 +525,7 @@ private:
const std::string & machine);
int createSubstitutionStep(pqxx::work & txn, time_t startTime, time_t stopTime,
Build::ptr build, const nix::StorePath & drvPath, const std::string & outputName, const nix::StorePath & storePath);
Build::ptr build, const nix::StorePath & drvPath, const nix::Derivation drv, const std::string & outputName, const nix::StorePath & storePath);
void updateBuild(pqxx::work & txn, Build::ptr build, BuildStatus status);
@@ -541,7 +541,7 @@ private:
void processQueueChange(Connection & conn);
BuildOutput getBuildOutputCached(Connection & conn, nix::ref<nix::Store> destStore,
const nix::Derivation & drv);
const nix::StorePath & drvPath);
Step::ptr createStep(nix::ref<nix::Store> store,
Connection & conn, Build::ptr build, const nix::StorePath & drvPath,