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

Process each system target pair individually

Browse source 
As the cross targets take quite some time.
This commit is contained in:
Christopher Baines 2022-03-11 11:12:18 +00:00
parent 9db755f27d
commit 8379427cbb
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -589,10 +589,9 @@ WHERE job_id = $1")
(append-map (append-map
(match-lambda (match-lambda
((system . targets) ((system . targets)
(list (map (lambda (target)
(map (lambda (target) (cons system target))
(cons system target)) targets)))
targets))))
cross-derivations)) cross-derivations))
(define (proc packages system-target-pairs) (define (proc packages system-target-pairs)
@ -726,14 +725,14 @@ WHERE job_id = $1")
(list ,@(map inferior-package-id packages))))) (list ,@(map inferior-package-id packages)))))
(append-map (append-map
(lambda (system-target-pairs) (lambda (system-target-pair)
(format (current-error-port) (format (current-error-port)
"heap size: ~a MiB~%" "heap size: ~a MiB~%"
(round (round
(/ (assoc-ref (gc-stats) 'heap-size) (/ (assoc-ref (gc-stats) 'heap-size)
(expt 2. 20)))) (expt 2. 20))))
(with-time-logging (with-time-logging
(simple-format #f "getting derivations for ~A" system-target-pairs) (simple-format #f "getting derivations for ~A" system-target-pair)
(catch (catch
'match-error 'match-error
(lambda () (lambda ()
@ -742,8 +741,8 @@ WHERE job_id = $1")
(simple-format (simple-format
(current-error-port) (current-error-port)
"warning: ignoring match-error from calling inferior invalidate-derivation-caches!\n"))) "warning: ignoring match-error from calling inferior invalidate-derivation-caches!\n")))
(inferior-eval-with-store inf store (proc packages system-target-pairs)))) (inferior-eval-with-store inf store (proc packages (list system-target-pair)))))
(append (map list supported-system-pairs) (append supported-system-pairs
supported-system-cross-build-pairs))) supported-system-cross-build-pairs)))
(define (deduplicate-inferior-packages packages) (define (deduplicate-inferior-packages packages)