cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Continue tweaking compute-and-fix-broken-derivations-in-revision

Browse source 
As I still can't figure out why it's not generating the broken derivations.
This commit is contained in:
Christopher Baines 2025-06-27 16:23:11 +02:00
parent 76cc8d82b9
commit 32dd8b661c
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -469,7 +469,8 @@
(append supported-system-pairs (append supported-system-pairs
supported-system-cross-build-pairs)) supported-system-cross-build-pairs))
(define (inferior-package-derivations store inf system target start-index count) (define* (inferior-package-derivations store inf system target start-index count
#:key debug?)
(define proc (define proc
`(lambda (store) `(lambda (store)
(define system-target-pair (define system-target-pair
@ -539,6 +540,12 @@
target target
system) system)
(package-derivation store package system)))) (package-derivation store package system))))
(when ,debug?
(simple-format
(current-error-port)
"debug: ~A ~A:~A: ~A\n"
package system target
(derivation-file-name derivation)))
;; You don't always get what you ask for, so check ;; You don't always get what you ask for, so check
(if (string=? system (derivation-system derivation)) (if (string=? system (derivation-system derivation))
(derivation-file-name derivation) (derivation-file-name derivation)
@ -1522,7 +1529,9 @@ WHERE builder != 'builtin:download'
(ignore-targets '()) (ignore-targets '())
(extra-inferior-environment-variables '()) (extra-inferior-environment-variables '())
(parallelism 4) (parallelism 4)
inferior-memory-limit) inferior-memory-limit
debug?
always-compute-derivations?)
(let ((broken-derivations (let ((broken-derivations
(find-broken-derivations-in-revision (find-broken-derivations-in-revision
commit commit
@ -1530,7 +1539,8 @@ WHERE builder != 'builtin:download'
#:ignore-targets ignore-targets))) #:ignore-targets ignore-targets)))
(simple-format #t "~A broken derivations\n" (simple-format #t "~A broken derivations\n"
(length broken-derivations)) (length broken-derivations))
(unless (= 0 broken-derivations) (when (or (not (null? broken-derivations))
always-compute-derivations?)
(run-fibers (run-fibers
(lambda () (lambda ()
(with-exception-handler (with-exception-handler
@ -1653,7 +1663,8 @@ WHERE builder != 'builtin:download'
system system
target target
start-index start-index
count))) count
#:debug? debug?)))
(when last-chunk? (when last-chunk?
(inferior-cleanup inferior)) (inferior-cleanup inferior))