Merge branch 'master' into nix-next

2024-01-23 15:49:14 -05:00
parent 20b0ad3ba2 d02e20a4c1
commit 9a86da0e7b
5 changed files with 68 additions and 42 deletions
--- a/src/hydra-queue-runner/builder.cc
+++ b/src/hydra-queue-runner/builder.cc
@@ -403,7 +403,7 @@ void State::failStep(
    Step::ptr step,
    BuildID buildId,
    const RemoteResult & result,
-    Machine::ptr machine,
+    ::Machine::ptr machine,
    bool & stepFinished)
 {
    /* Register failure in the database for all Build objects that