From patchwork Mon Apr 8 17:54:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 62854 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F174327BBE9; Mon, 8 Apr 2024 18:57:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 34ABD27BBEA for ; Mon, 8 Apr 2024 18:57:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rttDo-0005eQ-V1; Mon, 08 Apr 2024 13:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rttDn-0005co-FP for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rttDm-0004qD-Vx for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rttDu-0001MM-EY for guix-patches@gnu.org; Mon, 08 Apr 2024 13:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70285] [PATCH 1/3] services: cuirass: Use separate extra options for cuirass web process. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70285 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70285@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 70285-submit@debbugs.gnu.org id=B70285.17125989365120 (code B ref 70285); Mon, 08 Apr 2024 17:56:02 +0000 Received: (at 70285) by debbugs.gnu.org; 8 Apr 2024 17:55:36 +0000 Received: from localhost ([127.0.0.1]:47578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDU-0001KV-7o for submit@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:36 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:46306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDQ-0001Jt-TY for 70285@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:34 -0400 Received: from localhost.localdomain (bba-86-99-90-22.alshamil.net.ae [86.99.90.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 2EE1C7960; Mon, 8 Apr 2024 17:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1712598919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sb64CWlROvHmKaoZWB0bskaJQvi1lCDCUNaMj4HvSeo=; b=AFKeNRW4r5L8Rk0FJKJhnBrF+c9FiMrrzB8YB4Wgq/o5myuDRI5Bl5WC1spr338Yhq5N7v qEf7VdOOR2253dr14Rr7tNGtpalNfpZctQbE0P9XDI0PJ7NR3iF68S87rG8Y4cmEugJibO r1R1iXLHgWqyGnh6GsJG71sEkXQfU/y4oM/sWFCgEatzacKzmu+zxnwi1HuFMhKVx6kDMw ZrJevwrRitdCkKN+WwgPrqEQA7QoaHb6tQBVWYsjX+yABavwW4X7KIdp58SloL8pJ92kwM imIPe8D8GE03pIqKd0Lo3dSeB2WQ6+9Qxi8kFR71CNp1D5+TFLAj2P+F1SLoaNfUQhfvK6 MZRqsxlmwwYUV/JNRyuQeYtYqw6HvKWG+4U+7WIts+k3TtduJ6j8g8QC9cSm2WhSAN8/Ed rVJa58CAPyDBrrphhWEqDHUD6rdPyyJ/NjVyBsC0aROJiMDhm/QbSkJpHpUlollmhd8ePA hS1lnJtaMFg/0w7BEnBwoQEP10zg1qLXFCGPGP1QTU/uVvU2aO0j//td2t9DWC9oAJqE4A B8lOGSefLaEkW/1FrP6/pDzcpJgO5SFB9TvdcEFPjB6uSZM2SUYF6XPPtONypdBKjJHgGa sF+BbjHXTD0Hz80DfD6ftmQ6RTlg5J+gYvljQMi7ZU352vs1o0btk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1712598919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sb64CWlROvHmKaoZWB0bskaJQvi1lCDCUNaMj4HvSeo=; b=+wNWqG4O2yNmyhHNMEU4R3BBh01xNuqwndlhv6vfkvhZO1b2xbH4TVpfa0xdpAD58wtnAR yFg2gIkPh0QunODg== Date: Mon, 8 Apr 2024 21:54:12 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Currently, "extra-options" is passed to both "cuirass register" and "cuirass web" processes. This makes it impractical since the extra parameters have to be intended for and supported by both processes. * gnu/services/cuirass.scm (): Add a web-extra-options field. (cuirass-shepherd-service): Replace extra-options with web-extra-options for cuirass web. * doc/guix.texi (Continuous Integration): Document the changes. Change-Id: Iba79c559ea8267aaf8f25248f3d18ed7b352cb60 --- doc/guix.texi | 5 ++++- gnu/services/cuirass.scm | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5827e0de14..77e17cb69c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34406,7 +34406,10 @@ Continuous Integration packages locally. @item @code{extra-options} (default: @code{'()}) -Extra options to pass when running the Cuirass processes. +Extra options to pass when running the @code{cuirass register} process. + +@item @code{web-extra-options} (default: @code{'()}) +Extra options to pass when running the @code{cuirass web} process. @end table @end deftp diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index bcdbffa2f3..b09d5601d4 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -120,6 +120,8 @@ (define-record-type* (fallback? cuirass-configuration-fallback? ;boolean (default #f)) (extra-options cuirass-configuration-extra-options + (default '())) + (web-extra-options cuirass-configuration-web-extra-options (default '()))) (define (cuirass-shepherd-service config) @@ -142,7 +144,8 @@ (define (cuirass-shepherd-service config) (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) - (extra-options (cuirass-configuration-extra-options config))) + (extra-options (cuirass-configuration-extra-options config)) + (web-extra-options (cuirass-configuration-web-extra-options config))) `(,(shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) @@ -192,7 +195,7 @@ (define (cuirass-shepherd-service config) "--parameters=" parameters)) '()) - #$@extra-options) + #$@web-extra-options) #:user #$user #:group #$group From patchwork Mon Apr 8 17:54:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 62853 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5216F27BBE9; Mon, 8 Apr 2024 18:57:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 79F7F27BBE2 for ; Mon, 8 Apr 2024 18:57:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rttDp-0005fY-Jq; Mon, 08 Apr 2024 13:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rttDn-0005dA-Sm for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rttDn-0004qI-Bd for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rttDu-0001MT-R4 for guix-patches@gnu.org; Mon, 08 Apr 2024 13:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70285] [PATCH 2/3] services: cuirass: Add new configuration options. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70285 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70285@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 70285-submit@debbugs.gnu.org id=B70285.17125989395134 (code B ref 70285); Mon, 08 Apr 2024 17:56:02 +0000 Received: (at 70285) by debbugs.gnu.org; 8 Apr 2024 17:55:39 +0000 Received: from localhost ([127.0.0.1]:47582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDW-0001Kf-Jz for submit@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:39 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:46318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDT-0001Jy-Mz for 70285@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:36 -0400 Received: from localhost.localdomain (bba-86-99-90-22.alshamil.net.ae [86.99.90.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 01EAA7ADC; Mon, 8 Apr 2024 17:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1712598922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JFv/aSK+ImodFm4LJiN/PQ4rU70hudvKNky215BJahQ=; b=ghciWt4uKdK+bUE2WMw1Y0P2SiE68os4dz+HOBZ2E8egjeMNo/SbnzCpPs7M3rq9OBeEo2 2bcvf2CrroCUrM4gp2du/CHI/20u/Nn1WUjT7s/8OhjnkA/Q7dOjzZMiAD0na9mMn1v15e 8AFFFaw6DeeeR0WEZ+Yg3CTRHKQnfS0TmEHO5NH/Pb3Q3YdQnkxmgJfYL6IVgHN6xARWVh XTGz2MPDaNaG5SSnzpbo708OViTTTDJx7lcvz81KzPrxFkRUV/gCgG9J0ByH9wPkJU/seF i5748WKOzUE1DqUN0hF0FvWPBIrSvAPumwbeMw4kX61lT4tdoTVBbu/bNJKUruTqfo5Ndc h34mEp8wwnsJgML2N7oYAD/RFAaIRoyJtTRtcytTOl2GyjkLn0KVrZs7Ow+WuS2Xvebrwt 0mAit8DYpsMRCAN7pfpLufmjtTL+RjWw9rbZFEaX8U1a1QzN+/0eUR/ogNKFc59DjeF5vr y06QyPDzy8qnASYNNPyqc8SXI/LjUIB8fmWSFuFrXihb8t8RIGbUZFMEtp+R1kdlhKQfOx dXsPNBPKm4KZAVsDQYkmBGycI4ajXfXCeCNQZnp2rz6KXmp208JPw8WE7Rpo87a8dcHeoc 8bwHFu9SRRbVy63UpyoD9qHDVFAXrUJsgOpb9S+4GykTc+NaXZjtc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1712598922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JFv/aSK+ImodFm4LJiN/PQ4rU70hudvKNky215BJahQ=; b=27m8fVRBtd5pmy1gPLhEeAD+IV1GTiP93BP7m6G1B2kNl+sQiFsdLDxLLd5naMYiTBBzrG dgUgWOBog473uPCQ== Date: Mon, 8 Apr 2024 21:54:13 +0400 Message-ID: <7ccac410c5f7d0c9b27c828bc088c485f22884a8.1712576504.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/cuirass.scm (): Add ttl and threads fields. (cuirass-shepherd-service): Handle the new options. * doc/guix.texi (Continuous Integration): Document them. Change-Id: I4387fbd7bf6766f4a54801f35c7ed82ce4eb9645 --- doc/guix.texi | 6 ++++++ gnu/services/cuirass.scm | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 77e17cb69c..90a6135882 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34368,6 +34368,12 @@ Continuous Integration Number of seconds between the poll of the repositories followed by the Cuirass jobs. +@item @code{ttl} (default: @code{"30d"}) +Duration to keep build results' GC roots alive. + +@item @code{threads} (default: @code{#f}) +Number of kernel threads to use for Cuirass. The default value should be appropriate for most cases. + @item @code{parameters} (default: @code{#f}) Read parameters from the given @var{parameters} file. The supported parameters are described here (@pxref{Parameters,,, cuirass, Cuirass}). diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index b09d5601d4..ac086dedb9 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -101,6 +101,10 @@ (define-record-type* (default "cuirass")) (interval cuirass-configuration-interval ;integer (seconds) (default 60)) + (ttl cuirass-configuration-ttl ;string + (default "30d")) + (threads cuirass-configuration-threads ;integer + (default #f)) (parameters cuirass-configuration-parameters ;string (default #f)) (remote-server cuirass-configuration-remote-server @@ -133,6 +137,8 @@ (define (cuirass-shepherd-service config) (user (cuirass-configuration-user config)) (group (cuirass-configuration-group config)) (interval (cuirass-configuration-interval config)) + (ttl (cuirass-configuration-ttl config)) + (threads (cuirass-configuration-threads config)) (parameters (cuirass-configuration-parameters config)) (remote-server (cuirass-configuration-remote-server config)) (database (cuirass-configuration-database config)) @@ -159,6 +165,12 @@ (define (cuirass-shepherd-service config) "--specifications" #$config-file "--database" #$database "--interval" #$(number->string interval) + "--ttl" #$ttl + #$@(if threads + (list (string-append + "--threads=" + (number->string threads))) + '()) #$@(if parameters (list (string-append "--parameters=" From patchwork Mon Apr 8 17:54:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 62855 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32DDE27BBE9; Mon, 8 Apr 2024 18:57:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2997127BBE2 for ; Mon, 8 Apr 2024 18:57:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rttDq-0005gU-NQ; Mon, 08 Apr 2024 13:55:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rttDo-0005dq-Bp for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rttDn-0004qP-RW for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rttDv-0001Mb-A7 for guix-patches@gnu.org; Mon, 08 Apr 2024 13:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70285] [PATCH 3/3] services: cuirass: Remove use-substitutes? configuration option. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 17:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70285 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70285@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 70285-submit@debbugs.gnu.org id=B70285.17125989425147 (code B ref 70285); Mon, 08 Apr 2024 17:56:03 +0000 Received: (at 70285) by debbugs.gnu.org; 8 Apr 2024 17:55:42 +0000 Received: from localhost ([127.0.0.1]:47584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDZ-0001Kw-73 for submit@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:41 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:54730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDW-0001KI-F4 for 70285@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:38 -0400 Received: from localhost.localdomain (bba-86-99-90-22.alshamil.net.ae [86.99.90.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id AD6E57ADE; Mon, 8 Apr 2024 17:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1712598925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fdEz3Ji0fFlrgKTaJSEZsGpIqFgMc8Eg57EarzTL3EU=; b=iERAYOT6dL6/stHEyqv6bKgy2LeE7+svNyRYKFovAZPh8lYma8LK1x72ayxVwsJ84ekMaH l9oLcWBZ8dLE0uj0XXCuQIGP+6Uncc2mvJbLUXhTn/m4Gs3qMJDCke95GQVizMMb7tNtDp hgt6xYXOZZCMCWc9mzeB2Ugpq9BDq3OKq7MS7UCJXMKLEYepoR6knBpclmkHfaQUILwxkU V4yTEv4x0b5PzI/M1su4cP4uUVLj8mDw8G57joZB3zAhjgE7Td6NOVd4FpperW2M1EzAyS 7Vpc8hGOWdTi/bnIDE/vlwfWuVQsnMm2ohZXluQ1h5faqVn4nt/x+FCb+YNS9BCgJNQ1ud 9VHW5poZVt/a/y2fkK8CY/LpuLah2IF4n6ZAg7oOrSTlORCz4EgjAf5LYoMkUe7Du7/Dh2 573N2iODjFT3aNHW9FPLxdyrqgdV6bj0HK4XXANjq10RG4j7OiybndvS9lQmXbe4CgSCy7 cc9X7pdp8QJmZ1JV0KxpL3K4WXPb8Gg0ENUs2cPaVnGw3GTgmD7i8B5hg07k07t0nCVu6r eFx/JyRtG3vufCiE8frZzQj4Vt95xB/E641GELZ6ILKvXvhifOutdrdO3JwoTq3iwcnQus PoMouOkG5atqaOQnzINO9jrFrrFYzYMREZsuBuQrhuCqM5jOiQY/M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1712598925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fdEz3Ji0fFlrgKTaJSEZsGpIqFgMc8Eg57EarzTL3EU=; b=2H8tcLTnVSaDkcs9LKoW2TlllrInFc4aUJknsxFdl+hsuIOjsEVc5nFDiM7hxgq2GbN1/w W/O4kJoUvNRsWBBg== Date: Mon, 8 Apr 2024 21:54:14 +0400 Message-ID: <4b85490a37a0e08146f31e544b671865bb5927a0.1712576504.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches As of Cuirass commit 9a1452ee021c9f773424961cfeef47ca0b7c5c5a, this option seems to be unused and kept for back compatibility there. * gnu/services/cuirass.scm (): Remove use-substitutes? field. (cuirass-shepherd-service): Remove the option. * doc/guix.texi (Continuous Integration): Remove option documentation. Change-Id: I933550ce76eecdf918b07891aa8212fd30a7c87e --- doc/guix.texi | 4 ---- gnu/services/cuirass.scm | 4 ---- 2 files changed, 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 90a6135882..cc55f48aea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34400,10 +34400,6 @@ Continuous Integration specifications records. The specification record is described in the Cuirass manual (@pxref{Specifications,,, cuirass, Cuirass}). -@item @code{use-substitutes?} (default: @code{#f}) -This allows using substitutes to avoid building every dependencies of a job -from source. - @item @code{one-shot?} (default: @code{#f}) Only evaluate specifications and build derivations once. diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index ac086dedb9..0684c149c1 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -117,8 +117,6 @@ (define-record-type* (default "localhost")) (specifications cuirass-configuration-specifications) ;gexp that evaluates to specification-alist - (use-substitutes? cuirass-configuration-use-substitutes? ;boolean - (default #f)) (one-shot? cuirass-configuration-one-shot? ;boolean (default #f)) (fallback? cuirass-configuration-fallback? ;boolean @@ -147,7 +145,6 @@ (define (cuirass-shepherd-service config) (config-file (scheme-file "cuirass-specs.scm" (cuirass-configuration-specifications config))) - (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) (extra-options (cuirass-configuration-extra-options config)) @@ -177,7 +174,6 @@ (define (cuirass-shepherd-service config) parameters)) '()) #$@(if remote-server '("--build-remote") '()) - #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) #$@(if fallback? '("--fallback") '()) #$@extra-options)