From aeb0c6115019e9faa8ece8c8a4937426b2470d36 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Wed, 9 Feb 2022 16:33:59 +0530
Subject: forge: Pass <forge-laminar-job> objects to ci-jobs-trigger-gexp.
* forge/forge.scm (ci-jobs-trigger-gexp): Accept <forge-laminar-job>
objects.
(forge-activation, forge-service-type): Pass <forge-laminar-job>
objects.
---
forge/forge.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/forge/forge.scm b/forge/forge.scm
index fbdce3b..526cc43 100644
--- a/forge/forge.scm
+++ b/forge/forge.scm
@@ -116,7 +116,8 @@ described by <forge-derivation-job> objects, transform them to
(forge-project-configuration-ci-jobs project)))
(define (ci-jobs-trigger-gexp ci-jobs)
- "Return a G-expression that triggers CI-JOBS."
+ "Return a G-expression that triggers CI-JOBS. CI-JOBS is a list of
+<forge-laminar-job> objects."
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
@@ -125,7 +126,7 @@ described by <forge-derivation-job> objects, transform them to
(newline (current-error-port))
(apply invoke
#$(file-append laminar "/bin/laminarc")
- "queue" '#$ci-jobs))))
+ "queue" '#$(map forge-laminar-job-name ci-jobs)))))
(define (forge-activation config)
(let ((projects
@@ -137,8 +138,7 @@ described by <forge-derivation-job> objects, transform them to
(program-file
(forge-project-configuration-name project)
(ci-jobs-trigger-gexp
- (map forge-laminar-job-name
- (forge-project-configuration-laminar-jobs project config))))
+ (forge-project-configuration-laminar-jobs project config)))
(forge-project-configuration-ci-jobs-trigger project)))
(forge-configuration-projects config))))
#~(begin
@@ -263,8 +263,7 @@ derivation to run."
#$(program-file
(forge-project-configuration-name project)
(ci-jobs-trigger-gexp
- (map forge-laminar-job-name
- (forge-project-configuration-laminar-jobs project config))))
+ (forge-project-configuration-laminar-jobs project config)))
#:user "laminar")))
(forge-configuration-projects config))))
(service-extension webhook-service-type
@@ -275,7 +274,6 @@ derivation to run."
(webhook-hook
(id (forge-project-configuration-name project))
(run (ci-jobs-trigger-gexp
- (map forge-laminar-job-name
- (forge-project-configuration-laminar-jobs project config)))))))
+ (forge-project-configuration-laminar-jobs project config))))))
(forge-configuration-projects config))))))
(default-value (forge-configuration))))
--
cgit v1.2.3