From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WLPfIye1EWSLAQEASxT56A (envelope-from ) for ; Wed, 15 Mar 2023 13:08:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SOimIye1EWQ5XAEAauVa8A (envelope-from ) for ; Wed, 15 Mar 2023 13:08:07 +0100 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 1A3703784B for ; Wed, 15 Mar 2023 13:08:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcPut-0005m9-Is; Wed, 15 Mar 2023 08:07:39 -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 1pcPuq-0005lh-78 for guix-devel@gnu.org; Wed, 15 Mar 2023 08:07:36 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcPuo-0000UP-Hc for guix-devel@gnu.org; Wed, 15 Mar 2023 08:07:35 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 696501699B; Wed, 15 Mar 2023 12:07:30 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ded49e8b; Wed, 15 Mar 2023 12:07:29 +0000 (UTC) References: <87lejzmisn.fsf@gmail.com> <87edpqlsza.fsf@gmail.com> <871qlqlmhf.fsf_-_@gmail.com> <6f365a84-6a73-40b1-8556-330b8566bdbb@app.fastmail.com> User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: Leo Famulari Cc: Maxim Cournoyer , Felix Lechner , guix-devel@gnu.org Subject: Re: Branch and release process (was: gnu: inetutils: Update to 2.4.) Date: Wed, 15 Mar 2023 12:04:29 +0000 In-reply-to: <6f365a84-6a73-40b1-8556-330b8566bdbb@app.fastmail.com> Message-ID: <87r0tqxloe.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678882087; a=rsa-sha256; cv=none; b=tqkT18OhZzVfp5Vd5w91iuiUU9Lu2o2f+rd83pljRofdeAwBFjQ8q3N2DC3Es/T1Br4MK4 eGRh5ecdRTCxVqbatWECTx61sqzZCf1gIrd1jrhgCF14T1QIUfLzRkjNA00fKMPMdm1rMY vTQHF5RKCv9Fg+8optRb2/mOE5d37ZmPq4ZMGH00ECSRUXMY/T60bplVBKwncTbHMhq95P B8v1eFYyY6cXrtuNpglSuyC1EHl0Syi3YrAZ43xLiq9vGzDfQj8SK95P+rz+A/Eg5Q3HVj SCcU0S+GuiMXb3F9gcEa719rw61dF3lMNOlvuS7I7/f4UaTVcniUc7jshbok/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678882087; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=WguRODLgXbHDcAsLSiBIXY9OcAZuZcd3g4vYUKRU0+U=; b=q8psVJKO6ajcMMwGrXIS7KIbfKJQaMB/Dubtr+yfDUg27f1NvxVZmi1TrQdspn+8nXFJNH aWfkpz85rSdE7Apr+AEYpbvnsd0OmJ77EL//AbN1EEH0eInC++YVnTrtmzNS9SCWnzAUqI EI5YM2EcVpKKPznBAQqcRBmLGBu8Ye5mQO+VG8BZsgvtzBCYYpcREH/1mBSYVg2vFpFBrs xGMacdj3LDUxlpRG00jwQyxRuXg0rdIcpKy4ClC4nMUvnMiw7xI3S5+IjYNNhtxiKJwRzb JRTDRVCkn+CTLnufVzvgRtcjw1Gsczwqt+jglQz0PI5XKZbup2IIrCXr4VISvQ== X-Migadu-Spam-Score: -1.63 X-Spam-Score: -1.63 X-Migadu-Queue-Id: 1A3703784B X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: +a5Y8Hi97g6V --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable "Leo Famulari" writes: > On Tue, Mar 14, 2023, at 23:30, Maxim Cournoyer wrote: >> Hi, >> >> Leo Famulari writes: >> >>> On Tue, Mar 14, 2023 at 09:10:33PM -0400, Maxim Cournoyer wrote: >>>> Felix Lechner writes: >>>> > With the core-updates process now abandoned, I retitled the issue to >>>>=20 >>>> Could you share the reference of that? I'm not against it, but our >>>> currently documented process still mention the good old staging and >>>> core-updates branches. >>> >>> At the Guix Days in February, we discussed the branching workflow and >>> reached a rough consensus that for non-core packages (defined in >>> %core-packages), we should try to adopt a more targeted "feature branch" >>> workflow. That's actually what we used to do, before we outgrew our old >>> build farm, after which we were barely able to build one branch at a >>> time (IIRC, we would stop building master in order to build core-updates >>> or staging). >>> >>> The discussion was summarized by Andreas here: >>> >>> https://lists.gnu.org/archive/html/guix-devel/2023-02/msg00066.html >> >> Thanks! I had missed it. It sounds promising! >> >>> Currently we are demo-ing this workflow in the wip-go-updates branch and >>> go-team Cuirass jobset. >> >> So the review happens first on the ML, then the changes land to the team >> branch, and then finally the feature branch gets merged to master? If >> the review has already happened and the package been tested (and built >> by QA), why is a feature branch needed? > > Because QA currently cannot process changes that cause more than 200 rebu= ilds. Note that this has been changing recently, and it's currently 600 builds per system [1]. 1: https://git.savannah.gnu.org/cgit/guix/qa-frontpage.git/tree/guix-qa-fro= ntpage/manage-builds.scm#n100 We can still increase it, but there's still more work needed on managing the builds and increasing the hardware available. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmQRtQFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfVbg/+P3QpuT3HVTe3pelK1unSbkbJLazYyBWV pSISmfUzV9VTQPon9m9JUHQJuMIp7j4fAfB2CWgo6I9w7XiRP2dFNrtXChlOW08W I2nMbdNuAKMGTi054maND0wCWl6637efsZBYBr74FmAcrBEw83JqltEZ3blIaRqD /iwR2a0QQ6CofW5mNgLaTASdeb3YuQJVivLUJnwVWsVzw1gSL44R7tTsmw+odMYB /3xuGubOzz+7OOEdrt0Q9wP+c/vNLuh3pc5KV2mnbChQGIm6OvvyTNVF++C+iz9s UX+S5BGirccZqai6FsvC0rgUtqmwI0id+sUHR6Ir0S5IzK1u/Owri6eNY/7CaYkJ cyx59I1GmXLQao02CE1aXaeUHxHU1tNbUc5hggmVkHMlbg+Hv0aPPVEkxJpzuN1I MM1apRHsvZBeVa6NSFnXTVZp/EDA2lUXSsmzbwmg0+z9JE+JEqQdD0VDFNtpe6xD EPPVxnROuNlx7G+095jcK2VkTb34Oeqx5P5Gq8qA1b+shFN8FegWoU6WfZlQvu5W /YnTaMACF3qyIOf854LRTn4pk/IY/o3J503Mnw2v8rsv/3MzLGLYOktQtyHStcfh ty6x59MOcgv1KmG6qHSdua41Xq7uehJsUGxFOudON0tpqCyTds6/TQ7lWnTDjSUw COrI/IvM9+g= =SKaf -----END PGP SIGNATURE----- --=-=-=--