me
/
guix
Archived
1
0
Fork 0
Code

ci: Add log and outputs keys. 

Add 'log and 'outputs properties to hydra objects. This way Cuirass won't
have to go through every derivation to add those properties.

* gnu/ci.scm (package->alist, image-jobs, system-test-jobs, tarball-jobs): Add
'log and 'outputs properties.
* build-aux/hydra/guix-modular.scm (build-job): Ditto.
master
Mathieu Othacehe 2020-10-01 15:57:27 +02:00
parent f88fea0eaa
commit c5cf45e906
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-aux/hydra/guix-modular.scm
View File

@ -48,6 +48,12 @@ for SYSTEM. Use VERSION as the version identifier."
#:pull-version 1 #:pull-version 1
#:guile-version "2.2")))) #:guile-version "2.2"))))
`((derivation . ,(derivation-file-name drv)) ;the latest 2.2.x `((derivation . ,(derivation-file-name drv)) ;the latest 2.2.x
(log . ,(log-file store (derivation-file-name drv)))
(outputs . ,(filter-map (lambda (res)
(match res
((name . path)
`(,name . ,path))))
(derivation->output-paths drv)))
(nix-name . ,(derivation-name drv)) (nix-name . ,(derivation-name drv))
(system . ,(derivation-system drv)) (system . ,(derivation-system drv))
(description . "Modular Guix") (description . "Modular Guix")

24
gnu/ci.scm
View File

@ -78,6 +78,12 @@
(let ((drv (package-derivation store package system (let ((drv (package-derivation store package system
#:graft? #f))) #:graft? #f)))
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(log . ,(log-file store (derivation-file-name drv)))
(outputs . ,(filter-map (lambda (res)
(match res
((name . path)
`(,name . ,path))))
(derivation->output-paths drv)))
(nix-name . ,(derivation-name drv)) (nix-name . ,(derivation-name drv))
(system . ,(derivation-system drv)) (system . ,(derivation-system drv))
(description . ,(package-synopsis package)) (description . ,(package-synopsis package))
@ -203,6 +209,12 @@ SYSTEM."
"Return a list of jobs that build images for SYSTEM." "Return a list of jobs that build images for SYSTEM."
(define (->alist drv) (define (->alist drv)
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(log . ,(log-file store (derivation-file-name drv)))
(outputs . ,(filter-map (lambda (res)
(match res
((name . path)
`(,name . ,path))))
(derivation->output-paths drv)))
(nix-name . ,(derivation-name drv)) (nix-name . ,(derivation-name drv))
(system . ,(derivation-system drv)) (system . ,(derivation-system drv))
(description . "Stand-alone image of the GNU system") (description . "Stand-alone image of the GNU system")
@ -308,6 +320,12 @@ system.")
(system-test-value test)))) (system-test-value test))))
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(log . ,(log-file store (derivation-file-name drv)))
(outputs . ,(filter-map (lambda (res)
(match res
((name . path)
`(,name . ,path))))
(derivation->output-paths drv)))
(nix-name . ,(derivation-name drv)) (nix-name . ,(derivation-name drv))
(system . ,(derivation-system drv)) (system . ,(derivation-system drv))
(description . ,(format #f "Guix '~a' system test" (description . ,(format #f "Guix '~a' system test"
@ -339,6 +357,12 @@ system.")
"Return Hydra jobs to build the self-contained Guix binary tarball." "Return Hydra jobs to build the self-contained Guix binary tarball."
(define (->alist drv) (define (->alist drv)
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(log . ,(log-file store (derivation-file-name drv)))
(outputs . ,(filter-map (lambda (res)
(match res
((name . path)
`(,name . ,path))))
(derivation->output-paths drv)))
(nix-name . ,(derivation-name drv)) (nix-name . ,(derivation-name drv))
(system . ,(derivation-system drv)) (system . ,(derivation-system drv))
(description . "Stand-alone binary Guix tarball") (description . "Stand-alone binary Guix tarball")