[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Ludovic Courtès |
Date: |
Mon, 9 Apr 2018 05:09:17 -0400 (EDT) |
branch: master
commit 2f37403606d31b7b9bfe68c57665d41faaa1d100
Author: Ludovic Courtès <address@hidden>
Date: Mon Apr 9 11:06:46 2018 +0200
base: 'spawn-builds' really builds by chunks.
Fixes a regression introduced in
074b9d02f1ca01007f39adbc019763027a51d9bd whereby we'd attempt to build
all of DRV at once.
* src/cuirass/base.scm (spawn-builds): Pass BATCH, not DRV, to
'build-derivations&' and to 'update-build-statuses!'.
---
src/cuirass/base.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 9e930d4..9985fd6 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -448,7 +448,7 @@ Derivations are submitted in batches of at most
MAX-BATCH-SIZE items."
(log-message "building batch of ~a derivations (~a/~a)"
max-batch-size (- total count) total)
(let-values (((port finish)
- (build-derivations& store drv)))
+ (build-derivations& store batch)))
(process-build-log port
(lambda (event state)
;; Catch any errors so we can keep reading
@@ -467,7 +467,7 @@ Derivations are submitted in batches of at most
MAX-BATCH-SIZE items."
;; 'build-derivations' doesn't actually do anything and
;; 'handle-build-event' doesn't see any event. Because of that,
;; adjust DB here.
- (update-build-statuses! store db drv)
+ (update-build-statuses! store db batch)
(loop rest (max (- count max-batch-size) 0))))))