From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QMSBGmzpI2A7MgAA0tVLHw (envelope-from ) for ; Wed, 10 Feb 2021 14:10:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iL4bFmzpI2C1agAAbx9fmQ (envelope-from ) for ; Wed, 10 Feb 2021 14:10:52 +0000 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 C75919404C6 for ; Wed, 10 Feb 2021 14:10:51 +0000 (UTC) Received: from localhost ([::1]:54130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9qCg-0007wB-My for larch@yhetil.org; Wed, 10 Feb 2021 09:10:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9qCV-0007w1-09 for guix-devel@gnu.org; Wed, 10 Feb 2021 09:10:39 -0500 Received: from flashner.co.il ([178.62.234.194]:54942) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9qCT-0001iW-6m; Wed, 10 Feb 2021 09:10:38 -0500 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id 4A42F40224; Wed, 10 Feb 2021 14:09:58 +0000 (UTC) Date: Wed, 10 Feb 2021 16:09:15 +0200 From: Efraim Flashner To: Leo Famulari Subject: branch naming conventions [was Re: Guix Day: Notes from the CI session] Message-ID: References: <87ft26xzci.fsf@inria.fr> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="td0Leu4ii4bI7LAD" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il 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.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.96 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: C75919404C6 X-Spam-Score: -3.96 X-Migadu-Scanner: scn1.migadu.com X-TUID: jDq3jbi7GqaS --td0Leu4ii4bI7LAD Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 09, 2021 at 04:46:36PM -0500, Leo Famulari wrote: > On Mon, Feb 08, 2021 at 06:07:25PM +0100, Ludovic Court=C3=A8s wrote: > > ## Open issue: branching strategy > >=20 > > - currently: building all of `master` + the "core" of `core-updates` > > - schedule > > - currently ad-hoc: volunteers get to choose when to freeze/merge > > - actions > > - pushes to `core-updates` should cancel all pending builds on that= branch (see Guix Build Coordinator) > > - have a dashboard showing active branches, statuses (wild-west, fr= ozen), and merge deadlines > > - could be implemented in Cuirass > > - specs could have extra properties (such as "merge deadline") th= at Cuirass would display > > - or it could use status info from the Data Service, as in https:= //data.guix-patches.cbaines.net/ > > - naming convention: `core-updates-frozen` vs `core-updates`, etc. >=20 > So, does anyone want to change the naming conventions? >=20 > I like the idea of, in normal times, only pushing to "core-updates-next" > and "staging-next", and then freezing and building "core-updates" and > "staging". My concern about that is that it basically swaps what we have now. Using -frozen makes it a bit clearer that we're building it out. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --td0Leu4ii4bI7LAD Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmAj6QgACgkQQarn3Mo9 g1HXLg/+PZI9D9pH3eJ8XYHTlbIiqPHlmoqES6u0r0Y4TWaHrl+5vAr26zRMv38f a2CVGCA91g8HQh01U8o+XL7lxkBskoV9xx5l/alrwF3Igf0LkPpM6uYW/54ABnWS 4AK2nK4/nL53feVm6uRmelaZs3+FY9hCSXsaGg+zHE/0xvGROecuC+Q6TvFcHSXm LvefIn+ihIzjtmYnko2bAS9Txhlrq9QoE4UnY1f+q13Q4+ORl5Ind06U8nbyTqX6 BxCFww+kknrqPtsIWfiojPTGnnzBn4G0eJhLXnQx4sDcUQ5YCVvUjFzHX5rMqY33 TTU1yPnWli1KxASe8irmXBl4k45Ay0LB3shrQpi7BwFtIuQKSaAY0DUDCHiclX43 zfLD20moCZyr9IzGQTulQRtxn50hcAuQB+mepJcF/H7VGIbxyxxrE5C3tKGsxzTc eo7/09KV/g1PJK+H7/SB117CttsvfnqSvRlkpLkbFI/K/8QbZO6iyHC5k/v0+mHo gFLuV+eOXrry2MRtgSYfKQMNySDBdwlSnulgNZn+1bUNRrYLotJlZPPN513Pp6w8 Slbk43gUn2OzDWYEBVcAjH3JtqWy0/5IsalhiiHlJ/bPCGkIPjlqqEI/F/ISWTJS FLZVVWt1+b1CAynAMy92j55iHZ7xvGo+GiySjt39IuI5S5i3BOA= =hT13 -----END PGP SIGNATURE----- --td0Leu4ii4bI7LAD--