amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

publish: Call (current-processor-count) later.

Browse source 
So that this is evaluated when the main part of the script runs.

I'm looking at this to allow using setaffinity in the publish tests.

* guix/scripts/publish.scm (%default-options): Remove workers default.
(guix-publish): Move the default to here.

Change-Id: I83cd0d048f2641291b5bd8a932b479b23dd92d29
This commit is contained in:
Christopher Baines 2025-03-03 19:50:13 +00:00
parent 70b2b33054
commit b55e3b1a4b
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guix/scripts/publish.scm
View file

@ -256,9 +256,6 @@ usage."
(public-key-file . ,%public-key-file)
(private-key-file . ,%private-key-file)
;; Default number of workers when caching is enabled.
(workers . ,(current-processor-count))
(address . ,(make-socket-address AF_INET INADDR_ANY 0))
(repl . #f)))
@ -1272,7 +1269,12 @@ return the corresponding socket. Otherwise return #f."
(nar-path (assoc-ref opts 'nar-path))
(repl-port (assoc-ref opts 'repl))
(cache (assoc-ref opts 'cache))
(workers (assoc-ref opts 'workers))
(workers (or (assoc-ref opts 'workers)
;; Default number of workers when caching is
;; enabled. Do this here to delay calling
;; (current-processor-count) until guix-publish is
;; called
(current-processor-count)))
;; Read the key right away so that (1) we fail early on if we can't
;; access them, and (2) we can then drop privileges.