diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-10-01 15:57:27 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-10-01 18:39:41 +0200 |
| commit | c5cf45e9068e4c1f97f7357a3c051b2ad19f5e25 (patch) | |
| tree | fed05f816177c8a6b6e2724191ff1f3e7025f153 /gnu/ci.scm | |
| parent | f88fea0eaa5796303790450ee4543a6d7e61a06e (diff) | |
| download | guix-patches-c5cf45e9068e4c1f97f7357a3c051b2ad19f5e25.tar guix-patches-c5cf45e9068e4c1f97f7357a3c051b2ad19f5e25.tar.gz | |
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.
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index c985cd653b..fc35be87b4 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -78,6 +78,12 @@ (let ((drv (package-derivation store package system #:graft? #f))) `((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)) (system . ,(derivation-system drv)) (description . ,(package-synopsis package)) @@ -203,6 +209,12 @@ SYSTEM." "Return a list of jobs that build images for SYSTEM." (define (->alist 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)) (system . ,(derivation-system drv)) (description . "Stand-alone image of the GNU system") @@ -308,6 +320,12 @@ system.") (system-test-value test)))) `((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)) (system . ,(derivation-system drv)) (description . ,(format #f "Guix '~a' system test" @@ -339,6 +357,12 @@ system.") "Return Hydra jobs to build the self-contained Guix binary tarball." (define (->alist 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)) (system . ,(derivation-system drv)) (description . "Stand-alone binary Guix tarball") |