From unknown Thu Aug 14 17:27:00 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#41828 <41828@debbugs.gnu.org> To: bug#41828 <41828@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Branching and rebuilding strategy changes Reply-To: bug#41828 <41828@debbugs.gnu.org> Date: Fri, 15 Aug 2025 00:27:00 +0000 retitle 41828 [PATCH 0/2] Branching and rebuilding strategy changes reassign 41828 guix-patches submitter 41828 Marius Bakke severity 41828 normal tag 41828 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 12 10:31:09 2020 Received: (at submit) by debbugs.gnu.org; 12 Jun 2020 14:31:09 +0000 Received: from localhost ([127.0.0.1]:40392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjki4-0004ut-Sv for submit@debbugs.gnu.org; Fri, 12 Jun 2020 10:31:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:49412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjki3-0004um-Q1 for submit@debbugs.gnu.org; Fri, 12 Jun 2020 10:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjki3-0001YR-IQ for guix-patches@gnu.org; Fri, 12 Jun 2020 10:31:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36812) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjki3-00061s-9V for guix-patches@gnu.org; Fri, 12 Jun 2020 10:31:07 -0400 Received: from ti0006q161-2604.bb.online.no ([84.202.68.75]:35312 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jjki2-0005C9-B8 for guix-patches@gnu.org; Fri, 12 Jun 2020 10:31:06 -0400 From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH 0/2] Branching and rebuilding strategy changes Date: Fri, 12 Jun 2020 16:31:04 +0200 Message-Id: <20200612143104.13986-1-marius@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This pull request adds a reduced 'staging' jobset to Cuirass, to prevent needless rebuilds outside of the freeze cycles. It also adjusts the documentation to more closely match the current staging and core-updates practices. Marius Bakke (2): ci: Add a 'staging' jobset. doc: Adjust branching and rebuilding strategy to match reality. doc/contributing.texi | 8 ++++---- gnu/ci.scm | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 12 10:34:44 2020 Received: (at 41828) by debbugs.gnu.org; 12 Jun 2020 14:34:44 +0000 Received: from localhost ([127.0.0.1]:40397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjklY-00050A-B4 for submit@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjklW-0004zy-Fz for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36866) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjklR-0006ac-6t for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:37 -0400 Received: from ti0006q161-2604.bb.online.no ([84.202.68.75]:35338 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jjklQ-0006Sy-No for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:37 -0400 From: Marius Bakke To: 41828@debbugs.gnu.org Subject: [PATCH 1/2] ci: Add a 'staging' jobset. Date: Fri, 12 Jun 2020 16:34:33 +0200 Message-Id: <20200612143434.14476-1-marius@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41828 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/ci.scm (%staging-packages): New variable. (hydra-jobs): Add case for 'staging and use it. --- gnu/ci.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/ci.scm b/gnu/ci.scm index fa67168e22..ee8faffd3b 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018, 2019 Clément Lassieur +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,6 +126,14 @@ SYSTEM." %guile-bootstrap-tarball %bootstrap-tarballs)) +(define %staging-packages + ;; Selected packages intended to be used for the staging jobset in between + ;; freeze cycles to avoid building everything all the time, yet still + ;; exercise the package graphs enough to catch regressions. + (map specification->package + '("guix" "emacs" "diffoscope" "network-manager" "syncthing" + "alacritty" "git" "git-annex" "krita" "qemu" "grub-hybrid"))) + (define (packages-to-cross-build target) "Return the list of packages to cross-build for TARGET." ;; Don't cross-build the bootstrap tarballs for MinGW. @@ -499,6 +508,12 @@ Return #f if no such checkout is found." package system)) %core-packages) (cross-jobs store system))) + ((staging) + ;; Build a small, but heavy sample only. + (append (map (lambda (package) + (package-job store (job-name package) + package system)) + %staging-packages))) ((hello) ;; Build hello package only. (if (string=? system (%current-system)) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 12 10:34:47 2020 Received: (at 41828) by debbugs.gnu.org; 12 Jun 2020 14:34:48 +0000 Received: from localhost ([127.0.0.1]:40400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjklb-00050R-Mz for submit@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjklY-0004zz-J8 for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36867) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjklT-0006ag-BV for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:39 -0400 Received: from ti0006q161-2604.bb.online.no ([84.202.68.75]:35340 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jjklS-0006T2-Q4 for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:39 -0400 From: Marius Bakke To: 41828@debbugs.gnu.org Subject: [PATCH 2/2] doc: Adjust branching and rebuilding strategy to match reality. Date: Fri, 12 Jun 2020 16:34:34 +0200 Message-Id: <20200612143434.14476-2-marius@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612143434.14476-1-marius@gnu.org> References: <20200612143434.14476-1-marius@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41828 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The amount of packages has more than tripled since this section was written. Adjust the rebuild limits and cycle lengths based on current practices. * doc/contributing.texi (Submitting Patches): Increase 'staging' rebuild limit to 1800 packages, and adjust the cycle to six weeks. Increase 'core-updates' cycle to six months. --- doc/contributing.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 88128e5498..c56f4fd2e9 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -991,16 +991,16 @@ rebuilding induced, commits go to different branches, along these lines: @item 300 dependent packages or less @code{master} branch (non-disruptive changes). -@item between 300 and 1,200 dependent packages +@item between 300 and 1,800 dependent packages @code{staging} branch (non-disruptive changes). This branch is intended -to be merged in @code{master} every 3 weeks or so. Topical changes +to be merged in @code{master} every 6 weeks or so. Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, @code{gnome-updates}). -@item more than 1,200 dependent packages +@item more than 1,800 dependent packages @code{core-updates} branch (may include major and potentially disruptive changes). This branch is intended to be merged in @code{master} every -2.5 months or so. +6 months or so. @end table All these branches are @uref{@value{SUBSTITUTE-SERVER}, -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 13 12:56:22 2020 Received: (at 41828) by debbugs.gnu.org; 13 Jun 2020 16:56:22 +0000 Received: from localhost ([127.0.0.1]:42443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jk9SA-0006Gv-0S for submit@debbugs.gnu.org; Sat, 13 Jun 2020 12:56:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jk9S9-0006Gh-1x for 41828@debbugs.gnu.org; Sat, 13 Jun 2020 12:56:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60263) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jk9S3-0003yv-OZ for 41828@debbugs.gnu.org; Sat, 13 Jun 2020 12:56:15 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=44566 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jk9S3-0003e5-1b; Sat, 13 Jun 2020 12:56:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Marius Bakke Subject: Re: [bug#41828] [PATCH 0/2] Branching and rebuilding strategy changes References: <20200612143104.13986-1-marius@gnu.org> Date: Sat, 13 Jun 2020 18:56:13 +0200 In-Reply-To: <20200612143104.13986-1-marius@gnu.org> (Marius Bakke's message of "Fri, 12 Jun 2020 16:31:04 +0200") Message-ID: <87mu56zyz6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41828 Cc: 41828@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Marius Bakke skribis: > This pull request adds a reduced 'staging' jobset to Cuirass, to > prevent needless rebuilds outside of the freeze cycles. > > It also adjusts the documentation to more closely match the current > staging and core-updates practices. > > Marius Bakke (2): > ci: Add a 'staging' jobset. > doc: Adjust branching and rebuilding strategy to match reality. Both LGTM. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 21 21:17:29 2020 Received: (at 41828-done) by debbugs.gnu.org; 22 Jun 2020 01:17:29 +0000 Received: from localhost ([127.0.0.1]:32953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnB5U-0003LV-Qd for submit@debbugs.gnu.org; Sun, 21 Jun 2020 21:17:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnB5Q-0003LG-Nv for 41828-done@debbugs.gnu.org; Sun, 21 Jun 2020 21:17:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33184) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnB5L-0006st-HU for 41828-done@debbugs.gnu.org; Sun, 21 Jun 2020 21:17:19 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:40530 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jnB5L-00007o-17 for 41828-done@debbugs.gnu.org; Sun, 21 Jun 2020 21:17:19 -0400 From: Marius Bakke To: 41828-done@debbugs.gnu.org Subject: Re: [bug#41828] [PATCH 0/2] Branching and rebuilding strategy changes In-Reply-To: <20200612143104.13986-1-marius@gnu.org> References: <20200612143104.13986-1-marius@gnu.org> Date: Mon, 22 Jun 2020 03:17:16 +0200 Message-ID: <87o8pbdhlv.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41828-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Marius Bakke writes: > This pull request adds a reduced 'staging' jobset to Cuirass, to > prevent needless rebuilds outside of the freeze cycles. > > It also adjusts the documentation to more closely match the current > staging and core-updates practices. > > Marius Bakke (2): > ci: Add a 'staging' jobset. > doc: Adjust branching and rebuilding strategy to match reality. I decided to scrap patch 1/2 in this series. Partly because it would not work as-is, and partly because I got another idea: instead of the reduced jobset, we can limit it to x86_64 only. That way we get substitutes for developers, but avoid the expensive and often needless rebuilds on other architectures. I will be doing that from here on in between freeze cycles. The other patch was pushed in bb9a99e6571c492d30f95c5b51ead6861d1dc098. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7wBpwACgkQoqBt8qM6 VPqOKAf/YgZd2Fh+NHiOX43dlHyZU7BeMSmwGFMF10yVzjlQws2qKIYVd2bikNxB Z1Whlvo7qOAViVuR0IL2F4eD7Z5ylHhAUgtLdEQFySOnsSZ9yL3bCrGSwwTkgC0D 4iDBpRyhBU3gtt9I4Mop7YznIeTrxmLehzNRjWSftPB8t+WOnOB2AuS4wGNDykUa oVwbUf5i6nWkNU5OUax4k2y96WYxz6lj6Uu/NwwZanpfUWCk3SPuO9KT34PeLnqg Ez2LrMN4xfmTlsxyrVWvKLXeO33PdLIKeJ+IfXK1h4s4cKWeRh9GzLFXBjaExOf+ Ovurv7vj+MRQXn7sBaIG0HSv/uxdkA== =Ro+G -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 14 17:27:00 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 20 Jul 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator