summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2022-05-25 09:18:07 +0100
committerChristopher Baines <mail@cbaines.net>2022-05-25 09:20:03 +0100
commitc4ad2757097b5989adc753565c22611f5a2c45cb (patch)
treec971bd0ce2c494a67d1149513a79640e2f73cbe4
parent436afdfe46f6aac173ae161eb52367b7fdc30944 (diff)
downloadguix-patches-c4ad2757097b5989adc753565c22611f5a2c45cb.tar
guix-patches-c4ad2757097b5989adc753565c22611f5a2c45cb.tar.gz
gnu: guix-build-coordinator: Update to 0-53.3de63f1.
* gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-53.3de63f1. * gnu/services/guix.scm (guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id): New procedure. (guix-build-coordinator-queue-builds-shepherd-services): Use the guix-data-service-build-server-id. * doc/guix.texi (Guix Build Coordinator): Document the new queue builds configuration field.
-rw-r--r--doc/guix.texi6
-rw-r--r--gnu/packages/package-management.scm6
-rw-r--r--gnu/services/guix.scm14
3 files changed, 22 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index cb2efacd3e..55c992ca25 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -34845,6 +34845,12 @@ derivations to build.
The Guix Data Service instance from which to query to find out about
derivations to build.
+@item @code{guix-data-service-build-server-id} (default: @code{#f})
+The Guix Data Service build server ID coresponding to the builds being
+submitted. Providing this speeds up the submitting of builds as
+derivations that have already been submitted can be skipped before
+asking the coordinator to build them.
+
@item @code{processed-commits-file} (default: @code{"/var/cache/guix-build-coordinator-queue-builds/processed-commits"})
A file to record which commits have been processed, to avoid needlessly
processing them again if the service is restarted.
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index ce97314481..619458a0d3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1318,8 +1318,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
- (let ((commit "ed3c806ab83c77c1b8f04bb399c66743f1858178")
- (revision "52"))
+ (let ((commit "3de63f1f66d5f0eb157ee60bc864404f386ee2b0")
+ (revision "53"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1330,7 +1330,7 @@ environments.")
(commit commit)))
(sha256
(base32
- "1b2xsax548q43jh95m7jza2lafiljciljxavrvhpx8xsj0nlsffc"))
+ "1ld761c48ad925p3kisnjvad50p6hyk77z0yjcr29681n73xzzz4"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 83c293bbb5..413bf51ad8 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -92,6 +92,7 @@
guix-build-coordinator-queue-builds-configuration-systems
guix-build-coordinator-queue-builds-configuration-system-and-targets
guix-build-coordinator-queue-builds-configuration-guix-data-service
+ guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id
guix-build-coordinator-queue-builds-configuration-processed-commits-file
guix-build-coordinator-queue-builds-service-type
@@ -230,6 +231,9 @@
(guix-data-service
guix-build-coordinator-queue-builds-configuration-guix-data-service
(default "https://data.guix.gnu.org"))
+ (guix-data-service-build-server-id
+ guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id
+ (default #f))
(processed-commits-file
guix-build-coordinator-queue-builds-configuration-processed-commits-file
(default "/var/cache/guix-build-coordinator-queue-builds/processed-commits")))
@@ -494,7 +498,9 @@
(define (guix-build-coordinator-queue-builds-shepherd-services config)
(match-record config <guix-build-coordinator-queue-builds-configuration>
(package user coordinator systems systems-and-targets
- guix-data-service processed-commits-file)
+ guix-data-service
+ guix-data-service-build-server-id
+ processed-commits-file)
(list
(shepherd-service
(documentation "Guix Build Coordinator queue builds from Guix Data Service")
@@ -517,6 +523,12 @@
#$@(if guix-data-service
#~(#$(string-append "--guix-data-service=" guix-data-service))
#~())
+ #$@(if guix-data-service-build-server-id
+ #~(#$(simple-format
+ #f
+ "--guix-data-service-build-server-id=~A"
+ guix-data-service-build-server-id))
+ #~())
#$@(if processed-commits-file
#~(#$(string-append "--processed-commits-file="
processed-commits-file))