From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 4FM9G2/vMmaIQQEAqHPOHw:P1 (envelope-from ) for ; Thu, 02 May 2024 03:42:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 4FM9G2/vMmaIQQEAqHPOHw (envelope-from ) for ; Thu, 02 May 2024 03:42:07 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=redscript.org header.s=mail1-rsa header.b=SOybTs+r; dkim=fail ("headers eddsa verify failed") header.d=redscript.org header.s=mail1-ed25519 header.b=52FVbbAp; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714614127; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lHRviWwQ2jlxgl37qr/4JxoRbTK2mJiM2V2Hk6Vp7jw=; b=kV0j94bLGEN3XX9Y5EiBhWFdW8ytrHgXAcCemyV19DBKHrQ2ij1bOXs2k2BT4oPlcvye/9 IEm/6LNMjIusdenCr1pbq4peLyzpdS7JR3SemBTpErwgW2DDSsR0ERhKl3iKbUYbhS3U8a zdWQblxR7fyYjWUtEycXx4xoLIqZgVVckNiooDZ/UFbrZ7wpvY6I1eNyhj2vYXRC9T3fbs fgwJj32l2P31ASZO4AnZ7Pg7qWO9SzIXC2nxOqTn5XqfChcnitpSVXqlrczLWKG1theiPK jF/zuqhDkBTOM63fokyk+18rkSaIIHCT6j1Na/13kaMXCAWMxw5/9CAbSKf+SQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=redscript.org header.s=mail1-rsa header.b=SOybTs+r; dkim=fail ("headers eddsa verify failed") header.d=redscript.org header.s=mail1-ed25519 header.b=52FVbbAp; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714614127; a=rsa-sha256; cv=none; b=RWzgCzm3NOwgbVdbdicw++XaHIOHgQsPAczM1PYWKAtHA9u0vj36plkkrAV6zeKXTJ2MyH ylXhVnE+RzQOrSvnSQOF0J7nWcwkMOE799ft+mX6+2Do7bos8YrcZHHCGHEM2vZdmQINr7 hOngibNJE8TwsbhsmNp3vlAYLUWR+eIE9VJCAw8klSZDJ54DfGq01oBsc3rzzqvIRTrquh ztK8gtaWYDm9qkegebNmg8asRqNPVzDMOSggFTAMn3lvjPRl/8qK8ajn8lOYDVe1hm21US 1muM6KNu8WdQT80uSEvoKVtwFH3VFxTO2PdJsdlTKlS2FsgPbTXbGtdWcIef4Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CCB18757A8 for ; Thu, 2 May 2024 03:42:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2LSA-0004c5-IO; Wed, 01 May 2024 21:41:42 -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 1s2LS8-0004aw-QA for guix-patches@gnu.org; Wed, 01 May 2024 21:41:40 -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 1s2LS8-00081n-HS for guix-patches@gnu.org; Wed, 01 May 2024 21:41:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s2LSU-0006lv-0R for guix-patches@gnu.org; Wed, 01 May 2024 21:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70285] [PATCH v2 1/3] services: cuirass: Use separate extra options for cuirass web process. References: In-Reply-To: Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 May 2024 01:42:01 +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 , ludo@gnu.org Received: via spool by 70285-submit@debbugs.gnu.org id=B70285.171461407025993 (code B ref 70285); Thu, 02 May 2024 01:42:01 +0000 Received: (at 70285) by debbugs.gnu.org; 2 May 2024 01:41:10 +0000 Received: from localhost ([127.0.0.1]:40522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2LRe-0006lB-DQ for submit@debbugs.gnu.org; Wed, 01 May 2024 21:41:10 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:47818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2LRd-0006l4-Da for 70285@debbugs.gnu.org; Wed, 01 May 2024 21:41:09 -0400 Received: from localhost.localdomain (bba-2-49-155-173.alshamil.net.ae [2.49.155.173]) (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 604D223B1; Thu, 2 May 2024 01:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1714614042; 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; bh=lHRviWwQ2jlxgl37qr/4JxoRbTK2mJiM2V2Hk6Vp7jw=; b=SOybTs+rJfFnhK+g67zocvHUPigERXp/3XtsN1NlJoO8vMgFcIK+Fys7pTeDaCkBtZdHQP if9XIWzpjZqtISQxzXGSaU+79CBhnsPj7Ipip2rrNvghMMPw12Qp9MlDQwY0E6RHCGTiO2 MTxcJ/HE+C4QPIpDwYGM0hYE8cyihx/YLMikngYzKKSwyS+8UXV8aYf26ql+enSBA3rT8g NPStjnsmXJ9gnzv0Az7oSFqHdfHygcNX7OqMaKX0RC7oh74wPFtVexhYspMCcB+1jKNRcK 6SG+SLMgXuoI0hUtFPUTOuPHsbLG+IWiPTGM2GdfIZCwIA5F39YJ8e/jYSyBCZW75ufjsx HAL0MS+XspKQr8hz98NYg4wAYGiug9Bde1pw4itF1fkxnu6mDhmP5yAyLV1V2z5vxpfUlA FHHdc30vZy0YkzEsEEA6e9Zur/K+FH9x/de4Z9lajlnBKvUD46a2ee2AjWyq9XW4JuuyMz j6mkwjqiMpPL6+mgI411vqVYuPdxzhDphiYMzDgAuo/lZY41bRjrF/Fyj4iMPkuySOa4eG ApkLMxXu14Dpk4pA9M0CGPzBTUfSqnMB/lDxRYYi4XsZQ7irGzjDQOr5arbdvWQ0EiT4BT 1FP67sOkltO9d6nbQoP3iPkAApfTlV3pWVYzp3WZWewNc79x+XYSs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1714614042; 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; bh=lHRviWwQ2jlxgl37qr/4JxoRbTK2mJiM2V2Hk6Vp7jw=; b=52FVbbApcOKE20sFIy/uZ0oqTQtu0VSigX1tr5bOG8A2JJ2Uc/xPsrE1746xr6cyFL48O3 1tgpHZ32R0jwCoAQ== Date: Thu, 2 May 2024 05:37:47 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Ahmad Draidi via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -6.39 X-Migadu-Queue-Id: CCB18757A8 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.39 X-TUID: Kx+T5sPo+6pK 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 --- v2 changes: None 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 3f5d4e7f0d..f93fe7e474 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34465,7 +34465,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 base-commit: 8bf41c80ef13ea57e834f4e23d649bd99a3e08fc -- 2.41.0