From: Ahmad Draidi via Guix-patches via <guix-patches@gnu.org>
To: 70285@debbugs.gnu.org
Cc: Ahmad Draidi <a.r.draidi@redscript.org>, ludo@gnu.org
Subject: [bug#70285] [PATCH v2 1/3] services: cuirass: Use separate extra options for cuirass web process.
Date: Thu, 2 May 2024 05:37:47 +0400 [thread overview]
Message-ID: <afc3d0e937cd07def1c13fd1f2a687f8e50b7faa.1714613869.git.a.r.draidi@redscript.org> (raw)
In-Reply-To: <cover.1712576504.git.a.r.draidi@redscript.org>
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
---
v2 changes: None
doc/guix.texi | 5 ++++-
gnu/services/cuirass.scm | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 3f5d4e7f0d..f93fe7e474 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -34465,7 +34465,10 @@ Continuous Integration
packages locally.
@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 deftp
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index bcdbffa2f3..b09d5601d4 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -120,6 +120,8 @@ (define-record-type* <cuirass-configuration>
(fallback? cuirass-configuration-fallback? ;boolean
(default #f))
(extra-options cuirass-configuration-extra-options
+ (default '()))
+ (web-extra-options cuirass-configuration-web-extra-options
(default '())))
(define (cuirass-shepherd-service config)
@@ -142,7 +144,8 @@ (define (cuirass-shepherd-service config)
(use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? 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
(documentation "Run Cuirass.")
(provision '(cuirass))
@@ -192,7 +195,7 @@ (define (cuirass-shepherd-service config)
"--parameters="
parameters))
'())
- #$@extra-options)
+ #$@web-extra-options)
#:user #$user
#:group #$group
base-commit: 8bf41c80ef13ea57e834f4e23d649bd99a3e08fc
--
2.41.0
next prev parent reply other threads:[~2024-05-02 1:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 17:48 [bug#70285] [PATCH 0/3] Cuirass service config options work Ahmad Draidi via Guix-patches via
2024-04-08 17:54 ` [bug#70285] [PATCH 1/3] services: cuirass: Use separate extra options for cuirass web process Ahmad Draidi via Guix-patches via
2024-04-08 17:54 ` [bug#70285] [PATCH 2/3] services: cuirass: Add new configuration options Ahmad Draidi via Guix-patches via
2024-04-29 21:33 ` Ludovic Courtès
2024-05-02 1:36 ` Ahmad Draidi via Guix-patches via
2024-05-04 16:21 ` bug#70285: " Ludovic Courtès
2024-04-08 17:54 ` [bug#70285] [PATCH 3/3] services: cuirass: Remove use-substitutes? configuration option Ahmad Draidi via Guix-patches via
2024-05-02 1:37 ` Ahmad Draidi via Guix-patches via [this message]
2024-05-02 1:37 ` [bug#70285] [PATCH v2 2/3] services: cuirass: Add new configuration options Ahmad Draidi via Guix-patches via
2024-05-02 1:37 ` [bug#70285] [PATCH v2 3/3] services: cuirass: Remove use-substitutes? configuration option Ahmad Draidi via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=afc3d0e937cd07def1c13fd1f2a687f8e50b7faa.1714613869.git.a.r.draidi@redscript.org \
--to=guix-patches@gnu.org \
--cc=70285@debbugs.gnu.org \
--cc=a.r.draidi@redscript.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).