ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

hydra-eval-guile-jobs: Adjust to multiple-output format.

Browse Source 
This is a followup to commit
10882a1ffdbc9c6050c0528cf95be98fb5541d50 ("Add multiple output
support").

* src/script/hydra-eval-guile-jobs.in (job-evaluations->sxml): Return
  several `output' tags in the body, and remove the `outPath' attribute
  of `job'.
This commit is contained in:
Ludovic Courtès 2013-03-27 00:06:04 +01:00
parent 9da89dd32b
commit 9a9f37f209
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/script/hydra-eval-guile-jobs.in
View File

@ -91,17 +91,11 @@ symbol/thunk pairs."
;; XXX: Add <arg ...> tags? ;; XXX: Add <arg ...> tags?
`(job (@ (jobName ,name) `(job (@ (jobName ,name)
(drvPath ,drv) (drvPath ,drv)
(outPath
;; Resolve Guix modules lazily.
,((guix-variable 'derivations
'derivation-path->output-path)
drv))
,@(opt-attr 'homepage 'home-page) ,@(opt-attr 'homepage 'home-page)
(license (license
,(let loop ((license (assoc-ref result 'license))) ,(let loop ((license (assoc-ref result 'license)))
(match license (match license
((? struct?) ((? struct?)
;; XXX: hack to access <license> objects
(struct-ref license 0)) (struct-ref license 0))
((l ...) ((l ...)
(string-join (map loop l))) (string-join (map loop l)))
@ -129,6 +123,14 @@ symbol/thunk pairs."
(compose %derivation-system (compose %derivation-system
(guix-variable 'derivations (guix-variable 'derivations
'read-derivation))))) 'read-derivation)))))
;; Resolve Guix modules lazily.
,(map (match-lambda
((name . path)
`(output (@ (name ,name) (path ,path)))))
((guix-variable 'derivations
'derivation-path->output-paths)
drv))
"\n")))) "\n"))))
jobs)))) jobs))))