me
/
guix
Archived
1
0
Fork 0
Code

services: cuirass: Use separate extra options for cuirass web process. 

Currently, "extra-options" is passed to both "cuirass register" and "cuirass
web" processes. This makes it impractical since the extra parameters have to
be intended for and supported by both processes.

* gnu/services/cuirass.scm (<cuirass-configuration>): Add a web-extra-options
field.
(cuirass-shepherd-service): Replace extra-options with web-extra-options for
cuirass web.
* doc/guix.texi (Continuous Integration): Document the changes.

Change-Id: Iba79c559ea8267aaf8f25248f3d18ed7b352cb60
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Ahmad Draidi 2024-05-02 05:37:47 +04:00 committed by Ludovic Courtès
parent 402d0a9b9d
commit 2cd6831161
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/guix.texi
View File

@ -34494,7 +34494,10 @@ When substituting a pre-built binary fails, fall back to building
packages locally. packages locally.
@item @code{extra-options} (default: @code{'()}) @item @code{extra-options} (default: @code{'()})
Extra options to pass when running the Cuirass processes. Extra options to pass when running the @code{cuirass register} process.
@item @code{web-extra-options} (default: @code{'()})
Extra options to pass when running the @code{cuirass web} process.
@end table @end table
@end deftp @end deftp

7
gnu/services/cuirass.scm
View File

@ -120,6 +120,8 @@
(fallback? cuirass-configuration-fallback? ;boolean (fallback? cuirass-configuration-fallback? ;boolean
(default #f)) (default #f))
(extra-options cuirass-configuration-extra-options (extra-options cuirass-configuration-extra-options
(default '()))
(web-extra-options cuirass-configuration-web-extra-options
(default '()))) (default '())))
(define (cuirass-shepherd-service config) (define (cuirass-shepherd-service config)
@ -142,7 +144,8 @@
(use-substitutes? (cuirass-configuration-use-substitutes? config)) (use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config)) (one-shot? (cuirass-configuration-one-shot? config))
(fallback? (cuirass-configuration-fallback? config)) (fallback? (cuirass-configuration-fallback? config))
(extra-options (cuirass-configuration-extra-options config))) (extra-options (cuirass-configuration-extra-options config))
(web-extra-options (cuirass-configuration-web-extra-options config)))
`(,(shepherd-service `(,(shepherd-service
(documentation "Run Cuirass.") (documentation "Run Cuirass.")
(provision '(cuirass)) (provision '(cuirass))
@ -192,7 +195,7 @@
"--parameters=" "--parameters="
parameters)) parameters))
'()) '())
#$@extra-options) #$@web-extra-options)
#:user #$user #:user #$user
#:group #$group #:group #$group