From: Andreas Enge <andreas@enge.fr>
To: 71947@debbugs.gnu.org
Cc: "Andreas Enge" <andreas@enge.fr>,
"Florian Pelz" <pelzflorian@pelzflorian.de>,
"Ludovic Courtès" <ludo@gnu.org>,
"Matthew Trzcinski" <matt@excalamus.com>,
"Maxim Cournoyer" <maxim.cournoyer@gmail.com>
Subject: [bug#71947] [PATCH 1/2] services: guix-build-coordinator-agent: Remove defaults.
Date: Fri, 5 Jul 2024 14:32:52 +0200 [thread overview]
Message-ID: <b95a332f3a2cdb9d3d28d273e3328eed09051fde.1720182298.git.andreas@enge.fr> (raw)
In-Reply-To: <cover.1720182298.git.andreas@enge.fr>
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>)
[max-parallel-builds, max-parallel-uploads]: Set default to #f.
(guix-build-coordinator-agent-shepherd-services): Check for
max-parallel-builds.
* doc/guix.texi (Guix Services): Adapt the documentation.
If set to #f, the default values are now taken as the defaults of the
guix-build-coordinator-agent command.
Change-Id: Ide6dde0e88aa0dc851b6295095f414ca2ddc72ac
---
doc/guix.texi | 6 +++---
gnu/services/guix.scm | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7d0824784d..d4d00fd4b8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -23,7 +23,7 @@
@copying
Copyright @copyright{} 2012-2024 Ludovic Courtès@*
-Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@*
+Copyright @copyright{} 2013, 2014, 2016, 2024 Andreas Enge@*
Copyright @copyright{} 2013 Nikita Karetnikov@*
Copyright @copyright{} 2014, 2015, 2016 Alex Kost@*
Copyright @copyright{} 2015, 2016 Mathieu Lirzin@*
@@ -39656,10 +39656,10 @@ Guix Services
The systems for which this agent should fetch builds. The agent process
will use the current system it's running on as the default.
-@item @code{max-parallel-builds} (default: @code{1})
+@item @code{max-parallel-builds} (default: @code{#f})
The number of builds to perform in parallel.
-@item @code{max-parallel-uploads} (default: @code{1})
+@item @code{max-parallel-uploads} (default: @code{#f})
The number of uploads to perform in parallel.
@item @code{max-allocated-builds} (default: @code{#f})
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 0182c21ea7..fdeaeeb472 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -194,10 +194,10 @@ (define-record-type* <guix-build-coordinator-agent-configuration>
(default #f))
(max-parallel-builds
guix-build-coordinator-agent-configuration-max-parallel-builds
- (default 1))
+ (default #f))
(max-parallel-uploads
guix-build-coordinator-agent-configuration-max-parallel-uploads
- (default 1))
+ (default #f))
(max-allocated-builds
guix-build-coordinator-agent-configuration-max-allocated-builds
(default #f))
@@ -443,8 +443,10 @@ (define (guix-build-coordinator-agent-shepherd-services config)
#~(#$(string-append "--name=" agent-name)
#$(string-append "--dynamic-auth-token-file="
token-file))))
- #$(simple-format #f "--max-parallel-builds=~A"
- max-parallel-builds)
+ #$@(if max-parallel-builds
+ #~(#$(simple-format #f "--max-parallel-builds=~A"
+ max-parallel-builds))
+ #~())
#$@(if max-parallel-uploads
#~(#$(simple-format #f "--max-parallel-uploads=~A"
max-parallel-uploads))
--
2.45.2
next prev parent reply other threads:[~2024-07-05 12:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 12:27 [bug#71947] [PATCH 0/2] Modify guix-build-coordinator-agent-service Andreas Enge
2024-07-05 12:32 ` Andreas Enge [this message]
2024-07-05 12:32 ` [bug#71947] [PATCH 2/2] services: guix-build-coordinator-agent: Add extra-options Andreas Enge
2024-07-09 2:40 ` [bug#71947] [PATCH 0/2] Modify guix-build-coordinator-agent-service Maxim Cournoyer
2024-07-09 2:41 ` Maxim Cournoyer
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=b95a332f3a2cdb9d3d28d273e3328eed09051fde.1720182298.git.andreas@enge.fr \
--to=andreas@enge.fr \
--cc=71947@debbugs.gnu.org \
--cc=ludo@gnu.org \
--cc=matt@excalamus.com \
--cc=maxim.cournoyer@gmail.com \
--cc=pelzflorian@pelzflorian.de \
/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).