From 11334d15d590073c631c574436d2110aa1ea2142 Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Sun, 19 Dec 2021 16:24:01 +0100 Subject: [PATCH] ci: Restrict substitute search to guix jobset. * guix/ci.scm (latest-builds): Add jobset keyword. (find-latest-commit-with-substitutes): Pass jobset "guix". Signed-off-by: Mathieu Othacehe --- guix/ci.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/ci.scm b/guix/ci.scm index 01b493b3af78e9296db7c43e4f139700e7583d3f..88b80f781d9a91a4445d77a0f7992846b5a2b2b8 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -208,7 +208,7 @@ api-agnostic." (map json->build (vector->list queue)))) (define* (latest-builds url #:optional (limit %query-limit) - #:key evaluation system job status) + #:key evaluation system job jobset status) "Return the latest builds performed by the CI server at URL. If EVALUATION is an integer, restrict to builds of EVALUATION. If SYSTEM is true (a system string such as \"x86_64-linux\"), restrict to builds for SYSTEM." @@ -218,6 +218,7 @@ string such as \"x86_64-linux\"), restrict to builds for SYSTEM." `("evaluation" ,evaluation) `("system" ,system) `("job" ,job) + `("jobset" ,jobset) `("status" ,status)))) ;; Note: Hydra does not provide a "derivation" field for entries in ;; 'latestbuilds', but Cuirass does. @@ -286,6 +287,7 @@ definitions at URL. Return false if no commit were found." (let* ((job-name (string-append "guix." (%current-system))) (build (match (latest-builds url 1 #:job job-name + #:jobset "guix" #:status 0) ;success ((build) build) (_ #f)))