From patchwork Thu Oct 12 12:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54778 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 69FB127BBE2; Thu, 12 Oct 2023 13:41:27 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 565B316D2F for ; Thu, 12 Oct 2023 13:41:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqv08-00062i-Ru; Thu, 12 Oct 2023 08:41:16 -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 1qquzZ-0005wC-Tf for guix-patches@gnu.org; Thu, 12 Oct 2023 08:40:44 -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 1qquzY-00074a-8c; Thu, 12 Oct 2023 08:40:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qquzu-0000hU-H1; Thu, 12 Oct 2023 08:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66491] [maintenance] hydra: build-package-metadata: Add boolean for Git submodules in sources.json. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 12 Oct 2023 12:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66491 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66491@debbugs.gnu.org Cc: Simon Tournier , ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: ludo@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16971144152374 (code B ref -1); Thu, 12 Oct 2023 12:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Oct 2023 12:40:15 +0000 Received: from localhost ([127.0.0.1]:41285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qquz8-0000cE-Nq for submit@debbugs.gnu.org; Thu, 12 Oct 2023 08:40:15 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qquz6-0000bl-Il for submit@debbugs.gnu.org; Thu, 12 Oct 2023 08:40:13 -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 1qquyZ-00056r-5V for guix-patches@gnu.org; Thu, 12 Oct 2023 08:39:40 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qquyW-0006kk-GK for guix-patches@gnu.org; Thu, 12 Oct 2023 08:39:38 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-406532c49dcso2837535e9.0 for ; Thu, 12 Oct 2023 05:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697114374; x=1697719174; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JfPpZOTp08yzNUuOVHgqUG35MN0/U/rdJpKbg65Fxdk=; b=PSaj1PeTnuT5sijBVbTJLe1ZNCV4j5g1N3il6chxbNq+nWfwgaZPcuiV5tseocD2X9 wUQWsaSJScDonV+xqR3b70s8rJN7pRpP6zkFnBxn2RTiHAalsDfgUfSxPOdQnvxcVESQ JD945NsMfX8oy7m6xh6Y6RVAQgBU8EVZiMafFaPs0HIzMhuj3WdHb+ZbSrszlmcpm1cq EV0imgmwPG5poyUSRpN/EWYXpcmBhrr7awQtHjOWEnNHw3FKdGT6SFyKR9QvGDOAJQpi YVHNpi9C/ZS41we/83s7VDwwQxfEB/rzLMZ4I22+LLCrAhCHEat8E6k84pJZSx7e3Y+O fzPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697114374; x=1697719174; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JfPpZOTp08yzNUuOVHgqUG35MN0/U/rdJpKbg65Fxdk=; b=gXPU+L25H7HbAE7+B5sE0w2FWpe7fkd77qChxTu40IVz5CAMZcj1bm1QQ42ZoKR0FY r4UqQcMqxWUS5tz0iPrcXszqn0G0X01N+7y5eYnuyXwUa8dETQ9TeqpCSd1HGsV5r/6M w/9MJ4xtQME7UrNsGvplXs2OK2YXXSBbAKMDRS4DGd2SnOunGgPxS0JJ1jGgX6zllB1X YV6IX6VZUJs+nO3T9QsYagYDyR5Gp1jUWAcLfYyTw49xjnxMXiNbVQRPfiLTrZ/nz1rB GSruqsHbAp1J+EXSwxSIMe+TvDpxswn2aPGlu9CaTe4GUAe9OrOcy80qFag9fGDZCcKd fxAQ== X-Gm-Message-State: AOJu0YywYqXAVC1MVZHYnmOiKK8C5p5+6V5PZgIC34ynceb7UujeNruY AfD7bHtRlxTfGH8QNMc/jhVXNDgZG4s= X-Google-Smtp-Source: AGHT+IF5t7UXxGWTqDzdalsybFwlprvXmcuRxrOrGDnBFhTyhTSwMSQ5kvPxONjRfzuFHqu5wF6FxA== X-Received: by 2002:a05:600c:3511:b0:405:4280:341d with SMTP id h17-20020a05600c351100b004054280341dmr21081150wmq.4.1697114373877; Thu, 12 Oct 2023 05:39:33 -0700 (PDT) Received: from lili.univ-paris-diderot.fr ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id m19-20020a7bcb93000000b003fe61c33df5sm21861191wmi.3.2023.10.12.05.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 05:39:33 -0700 (PDT) From: Simon Tournier Date: Thu, 12 Oct 2023 14:39:31 +0200 Message-ID: <20231012123931.390137-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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 This format had been discussed in * hydra/build-package-metadata.scm (origin->json)[resolve]: Add the keyword 'submodule' when the Git reference is recursive. --- hydra/build-package-metadata.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Hi, This patch helps on SWH side. Nevertheless, if it is possible from your side to add a new boolean field in the JSON file (submodules ?) indicating that submodules should be fetched to compute the hash, this will simplify the processing from our side. Cheers, simon base-commit: 8f703892a6d549d52eb0374deb11d6af734065d4 diff --git a/hydra/build-package-metadata.scm b/hydra/build-package-metadata.scm index 0a75204..9f90c5e 100755 --- a/hydra/build-package-metadata.scm +++ b/hydra/build-package-metadata.scm @@ -182,7 +182,10 @@ superseded packages." "recursive")))) '()) ,@(if (eq? method git-fetch) - `(("git_ref" . ,(git-reference-commit uri))) + `(("git_ref" . ,(git-reference-commit uri)) + ,@(if (git-reference-recursive? uri) + '(("submodule" . "true")) + '())) '()) ,@(if (eq? method svn-fetch) `(("svn_revision" . ,(svn-reference-revision uri)))