From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UOuAL7SHjWT0cQAASxT56A (envelope-from ) for ; Sat, 17 Jun 2023 12:15:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GDnBLrSHjWTS3AAAauVa8A (envelope-from ) for ; Sat, 17 Jun 2023 12:15:16 +0200 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 A66F3AEC5 for ; Sat, 17 Jun 2023 12:15:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qASxE-00079G-Ix; Sat, 17 Jun 2023 06:14:48 -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 1qASxC-000796-U2 for guix-devel@gnu.org; Sat, 17 Jun 2023 06:14:46 -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 1qASxB-0001wg-71 for guix-devel@gnu.org; Sat, 17 Jun 2023 06:14:46 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 8FC5627BBE2; Sat, 17 Jun 2023 11:14:42 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c0ff5287; Sat, 17 Jun 2023 10:14:41 +0000 (UTC) References: <87y1kuyqew.fsf@cbaines.net> <87o7lktodm.fsf@cbaines.net> <871qiaslx6.fsf@protonmail.com> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines To: John Kehayias Cc: guix-devel@gnu.org Subject: Re: Changes to the branching/commit policy Date: Sat, 17 Jun 2023 10:57:59 +0100 In-reply-to: <871qiaslx6.fsf@protonmail.com> Message-ID: <87edmal7jk.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, T_SCC_BODY_TEXT_LINE=-0.01 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-Seal: i=1; s=key1; d=yhetil.org; t=1686996915; a=rsa-sha256; cv=none; b=SXRIiWn5SPvxDFe1NFmXEQUu1fw0ttRHcEXCeYxegrZOdj3+ITylvb7FOVpsTe0oJgwfbS kz14vuazR5G18Lsu+NIcnQ0shprYUW2XbUP1wXFKIwYlcCdt0Y64ixpNWA3xSn/VNaCfDK 05GWi4adOAyBhJH83YgMHQH3ZgAkkRMeOK42wYhBJzBN7T8IpL8V8geCFntKvf2KuBreUv XM43yZIIyg7jvRM+giT+TgTf1mekymbl5n4/AgNi6iTCABMadm32g5l5QvSuazkygChoiK ye8BRPZagP52YbUrCe0MKldIl9KSvuupl2Jc31ho2kzfGtaGCi6uqlunN99TEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686996915; 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=+Eloh4eweQmgm4u3SXrXxZZtY+S9gjxLs3BwkMymUOU=; b=CrzGaLByI2z54e7eYWMUpyC04HiYiutRq+QB8ML/GjrCyrcV/qk6PZm8d4XPbuao0o9EjA yFUKecQM9la3MaVPnCgmiISd25aGorEVdaFYtVBywiR5xNywKtdqXMBlnVuc+CpTUBkFE8 Rn4rnfVwl4BRCpcN6kwFe8YyJ2IOEonwEsHkv7KY6cUUDHUtlbkT/oiapiNLTObXJ8ud6h SqgT867T9Qd/GhXezSSSATskTCNUJIRAIUMIKtecy7HJwgIXyyj15OO+XIcnTAhAIL7YgM 3JBZqoNXDb+bF41gOqw/5zumQNKiwUdhfFxYLvDumG11VwOlSG/QZIR4ewiGaQ== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -4.63 X-Spam-Score: -4.63 X-Migadu-Queue-Id: A66F3AEC5 X-TUID: 4S4bicja75aV --=-=-= Content-Type: text/plain John Kehayias writes: >> I've now merged these changes as >> 0ea096ae23fa81f05ce97e5e61c15647c0a475ec. >> >> You can now see the updated Commit Policy on the website [1] (you might >> need to force a refresh), as well as the new section on managing patches >> and branches [2]. >> >> 1: >> 2: >> > > Thanks for these changes! Question on branches (sorry if this was > covered in a previous thread, but now that we have new language in the > manual I figure this is a good place): do we have a convention on > branch names and subject headers for emailing patches for the branch? > e.g. does [PATCH 1/3] do anything on the QA end? On the names of branches, there's some typical names like XXXX-team, or wip-XXXX but really it's up to you. QA doesn't currently support applying patches to anything other than the master branch, but that's something that should probably be addressed at some point. I'd encourage you to do whatever you think is useful here, then hopefully QA can use that to act appropriately. > Or does the section about branch building for once patches are pushed > to a branch on Savannah? I'm not sure what you're asking here. > Does that mean pushing to a branch should follow the same 1-2 week > review allowing QA builds? I guess patch series are always built > together on QA but wondering if there is anything else to be aware of > or needs mentioning to keep things tidy and clear. Those durations mentioned in the commit policy [1] are intended to allow for human review. For QA, it doesn't need to be time based as it can report it's progress. Obviously it does need a bit of time to check things, but I prefer to leave it up to people to assess the changes and any information provided by QA and decide when it's appropriate to push. 1: https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html#Commit-Policy On keeping things clear, I think with branches I'm hoping the issue tracker can help with this, which is why there's now a strong requirement to create a guix-patches issue when you want to merge a branch, and use those issues to manage the timing. For those issues, there's currently a convention of using the following title: `Request for merging "XXXX" branch` e.g. [2]. That helps QA find these issues and act accordingly, but of course if someone comes up with a better way of naming these issues, we can just adjust the code in the qa-frontpage. 2: https://issues.guix.gnu.org/63713 3: https://git.savannah.gnu.org/cgit/guix/qa-frontpage.git/tree/guix-qa-frontpage/branch.scm#n63 Thanks for your questions :) Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSNh49fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdRjhAAoByhwPiZpxp3Z+NiK5Tsbb8HwcVG858w 6mKoPz5n8P3/wpCsNoU04pCyJJw3yUu2TbquoDLPiIF4znekBzsEf5cssCo7odst 3y23MbiiYNKQX95maPa78XAILoopdBoDu5pO+oHZ8TkjhQVgpNQJ2ekaoNyc2mNz SFu9hWzp0JHv9K8hvG/gGIYTFirpiekDtfbxjWROKyFKcsEWsW/gqlfUleSdG8fo ihtzpMwYqw6lC3eW+woujj0qHkXuyboCyWBOAgAygzu7pkivbaSkEbSCrI6102DP shSDfKxt0y3eQsfZIKkvldyCLpg4YtnSwREHNAuFOR5O38THY+6gx/WlD15jpilV 5FeL1V2dAbYpeQHKlmg97oFaMNyT66La85qqpBdYFqHD93vFNIsF+OeCdA53FGIp AZo8LUTeoVdm+L/VmuDF+4LIUuxFz3xS5lT4wrXH4KjBmzbi/1+IQ1wF0M6zGdol 8d4J6wmM7LJWcSRidoFfVO1+SqDzW7mg4MqoF4otjMQ4mzyAp7IHBkBQh8NdhJLo 3TbUtAOL5jCl5TFHDNg6JOwIjgDIuVWFT7Bn57uZGkYKxPh9xhBJp2T9DU+y8Ee/ kPuw0hlaOQrv5by7CIYqIKbv+ivNLHatNR1f8G0/jN4vEZZm21outlAdkNmVCTyq +5kkc8v9lBE= =qiQ3 -----END PGP SIGNATURE----- --=-=-=--