From patchwork Tue Aug 22 16:52:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53102 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 72EAE27BBEA; Tue, 22 Aug 2023 17:56:26 +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 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 9A9E227BBE2 for ; Tue, 22 Aug 2023 17:56:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYUfj-0004XY-EU; Tue, 22 Aug 2023 12:56:03 -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 1qYUfi-0004WG-Du for guix-patches@gnu.org; Tue, 22 Aug 2023 12:56:02 -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 1qYUfi-0000un-3y; Tue, 22 Aug 2023 12:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYUfk-0007k4-2u; Tue, 22 Aug 2023 12:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v4 10/10] gnu-maintenance: Consider Qt source tarballs as "release files". Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 22 Aug 2023 16:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65230@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65230-submit@debbugs.gnu.org id=B65230.169272332629652 (code B ref 65230); Tue, 22 Aug 2023 16:56:04 +0000 Received: (at 65230) by debbugs.gnu.org; 22 Aug 2023 16:55:26 +0000 Received: from localhost ([127.0.0.1]:60352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYUf8-0007i7-3K for submit@debbugs.gnu.org; Tue, 22 Aug 2023 12:55:26 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:59461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYUeu-0007gp-Mn for 65230@debbugs.gnu.org; Tue, 22 Aug 2023 12:55:13 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-64bb576b8abso21736976d6.2 for <65230@debbugs.gnu.org>; Tue, 22 Aug 2023 09:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692723304; x=1693328104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Tqp3zsF7Alq54SgeLifkC+ZNG4wmNBNo8AM6mJ5zvY=; b=WR3dKOMqtOp5z1/LCL9keoKKyK+N1K5dQcLEj48o0CVRdEtKviK6vUzyWTpIrwpknJ L3zTAL3FAvhJImCN44QDff5uKiLf7GWLcltZB0x9fxlSaMHLlRPYXt3CyfdPJh6NkwdA e4cQ6LXi4mkMPmfUOehPEHvxqz7CAPf+3sSO99xRTb6n0Bh6wHEktTUOL2A+Fyq/qIXf IZ0c7MfTV3vD6CqY8gwCF5T/D/ear2yVuxiuBLqV91cA/YedfulcPA5tZEf3Nl6cF5Dh 9gjW/AC9JQNSUzul1sCzF+LJfA9DPV4eKjasVcFuGI5KbxyabG2IioTAHU2W7yPXqOgp uSdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692723304; x=1693328104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Tqp3zsF7Alq54SgeLifkC+ZNG4wmNBNo8AM6mJ5zvY=; b=OaKC63SmOHaCsx5AzirdyUkxuLngU0Qn8BgS/05/w4S99nHsXk+rPG5MtkpG1nF/H+ +339+ceb5PZxkFvDy+5RMFBPkw7QmovR1U3Phveof0X86wuWs7INSkyfnHxR5O2d5qRt D12LLyn4DJk5N6kRCBGgo8BN8X7U/0p5gjTliOnBYWxpOMJXQrZeoZOI6p/wP13gC5Zp MuW2XPx+QkFU+VWa1XJ/jsBXoSMXmKQdZlwuZ8XGbxW7CqeOwMRBXJVFQwe+zUb/Ln9m YSJgEofPY42mbsz+f+x2AWuHFdRR/4TwNrnNAg1VwEwr6Ab0LehiD7yITKz7HJTHV/sB TMpQ== X-Gm-Message-State: AOJu0Yz8PTCslU8drih0P2J1SU+obiRYP8KtTcNeURdc7lHDs7tdASSl tkVRNzujQHb+HVTVJMrHsCKcGecSCcY= X-Google-Smtp-Source: AGHT+IFriOxEDs2MF5rTL3ccV22iNzhXDJBhLd8tc3t8B3Nre3S33D8Rs61sFbYVPOfKw96RF6BZDA== X-Received: by 2002:ad4:559b:0:b0:64a:3073:e549 with SMTP id f27-20020ad4559b000000b0064a3073e549mr8856114qvx.59.1692723304046; Tue, 22 Aug 2023 09:55:04 -0700 (PDT) Received: from localhost.localdomain (dsl-158-129.b2b2c.ca. [66.158.158.129]) by smtp.gmail.com with ESMTPSA id p12-20020ae9f30c000000b007678973eaa1sm3336262qkg.127.2023.08.22.09.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 09:55:03 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 22 Aug 2023 12:52:27 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <06b6c57b1af15b6ddca780182fc4a5e5264a67db.1692723147.git.maxim.cournoyer@gmail.com> References: <06b6c57b1af15b6ddca780182fc4a5e5264a67db.1692723147.git.maxim.cournoyer@gmail.com> 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: , 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 * guix/gnu-maintenance.scm (release-file?): Use positive logic in doc. Add a special case for Qt source archives. * tests/gnu-maintenance.scm ("release-file?"): Update test. --- (no changes since v3) Changes in v3: - Move a couple Qt-specific commits to the qt-updates branch Changes in v2: - Also special case release file of Qt Creator guix/gnu-maintenance.scm | 18 +++++++++++++----- tests/gnu-maintenance.scm | 5 ++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index eb30b7874f..ee6e0db747 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -258,8 +258,7 @@ (define %alpha-tarball-rx (make-regexp "^.*-.*[0-9](-|~|\\.)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\.")) (define (release-file? project file) - "Return #f if FILE is not a release tarball of PROJECT, otherwise return -true." + "Return true if FILE is a release tarball of PROJECT." (and (not (member (file-extension file) '("sig" "sign" "asc" "md5sum" "sha1sum" "sha256sum"))) @@ -268,12 +267,21 @@ (define (release-file? project file) ;; Filter out unrelated files, like `guile-www-1.1.1'. ;; Case-insensitive for things like "TeXmacs" vs. "texmacs". ;; The "-src" suffix is for "freefont-src-20120503.tar.gz". + ;; The '-everywhere-src' suffix is for Qt modular components. (and=> (match:substring match 1) (lambda (name) (or (string-ci=? name project) - (string-ci=? name - (string-append project - "-src"))))))) + (string-ci=? name (string-append project "-src")) + (string-ci=? + name (string-append project "-everywhere-src")) + ;; For older Qt releases such as version 5. + (string-ci=? + name (string-append + project "-everywhere-opensource-src")) + ;; For Qt Creator. + (string-ci=? + name (string-append + project "-opensource-src"))))))) (not (regexp-exec %alpha-tarball-rx file)) (let ((s (tarball-sans-extension file))) (regexp-exec %package-name-rx s)))) diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm index 196a6f9092..61ae295b96 100644 --- a/tests/gnu-maintenance.scm +++ b/tests/gnu-maintenance.scm @@ -40,7 +40,10 @@ (define-module (test-gnu-maintenance) ("exiv2" "exiv2-0.27.3-Source.tar.gz") ("mpg321" "mpg321_0.3.2.orig.tar.gz") ("bvi" "bvi-1.4.1.src.tar.gz") - ("hostscope" "hostscope-V2.1.tgz"))) + ("hostscope" "hostscope-V2.1.tgz") + ("qtbase" "qtbase-everywhere-src-6.5.2.tar.xz") + ("qtbase" "qtbase-everywhere-opensource-src-5.15.10.tar.xz") + ("qt-creator" "qt-creator-opensource-src-11.0.1.tar.xz"))) (every (lambda (project+file) (not (apply release-file? project+file))) '(("guile" "guile-www-1.1.1.tar.gz")