From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 yCjjEh3JEWTtZwEASxT56A (envelope-from ) for ; Wed, 15 Mar 2023 14:33:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id wNv8ER3JEWScZQEAG6o9tA (envelope-from ) for ; Wed, 15 Mar 2023 14:33:17 +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 124EA3B134 for ; Wed, 15 Mar 2023 14:33:16 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gMmcrH6Z; dmarc=pass (policy=none) header.from=gmail.com; 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=1678887197; 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:dkim-signature; bh=gzBI6MS+HqRp/ea3v56OH39qhwymvDsQuCpyq4SFmtc=; b=m8F4Pf1wymxgbZHXxFs5X6Gl4VC3hBvqb/bBwQ1qtqoLkb1Q49hxFtOxfeEoj3fKN1FHpE Y7HFgPatT/zs3zCJ4W0zzdJm7qOkWs2SG7oKMudW5LA2VdHwyiIEdVulOSfh4ey72aB/dG c7U5v1xGEW5q6rUdTP/crYRRrmBicAt8XH09jTg1CiWHIhbwNC2r1bgix3D9C8iZxLLYuF m6vmGae2joqM9s3WOSba6HtVX4Ys+6NBGSgQd4rWF++nPxARJaGaSra0uhTWvU9Tgu6LPZ 2ZXCwjKyNq+vov8V9YZ5KvWOx12Y6zjmIjnRWi53qNBfWg6WTH4r6oS6l7S9og== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gMmcrH6Z; dmarc=pass (policy=none) header.from=gmail.com; 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-Seal: i=1; s=key1; d=yhetil.org; t=1678887197; a=rsa-sha256; cv=none; b=aQIfmqxGuEWOlxfJChyMMdutsTrJ9BnQwo8J527/KZvxyawlGqcvKVb7Fc7AUf4s5kWSPl vzfxP7QP9aQCwRhC2gLvvdNZCUMRWgG8BjEAO5vxSm8ORqZT8JOVR7bMsv4V3YmFIoBnpz Aen9dG718XzyMH+PKo6oX04BR6hMsCt066uFh+ZoCOyI4NDwoIP/ZIuI1GEneDdgNvE7L1 boFgk4yO0Rbm1lC4Wv9l9E59E6KTcIXFQW4JhQftyYC5GKfogFI2IY9AWipfmoq1MSyswi UfjUsLA1co44t/5N3QTVRk5TPM43/46aKX7oWiBpAtJFPNKZZ8Bbv8g1Ub9iaw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcRFL-0001LL-25; Wed, 15 Mar 2023 09:32:51 -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 1pcRFJ-0001L1-Ae for guix-devel@gnu.org; Wed, 15 Mar 2023 09:32:49 -0400 Received: from mail-yw1-x112a.google.com ([2607:f8b0:4864:20::112a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcRFH-0003dD-Bq for guix-devel@gnu.org; Wed, 15 Mar 2023 09:32:48 -0400 Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-53d277c1834so368127697b3.10 for ; Wed, 15 Mar 2023 06:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678887165; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=gzBI6MS+HqRp/ea3v56OH39qhwymvDsQuCpyq4SFmtc=; b=gMmcrH6ZLrVGOcCulnWE6qbRpaxpguZkW8XizVLilq78s37egDsEM2db0UoW2Sq+nx /vDx+YAkcitbZ+ZIMus+BLzHeS4hVQRTr9j8YGzOvqWcUP+sT0/Hrzb1Fmeg+/icQYMV EkT4kbGOd7v8RzRrVUoBkFFIIyTixPw1svIGgVyOgTiwCdCQ8EajcLP8AujVMFy0SsHr 4WyUmdy5QCiYp6270PVWTAGFLeUs07u6SoJyGqVurfoqbuFxjoRuPOyxaybY89H8fHNk drSj81h8WpqAJ8vG2i09wWL4HsdqE496wThwRMM8ChHOQSw9wbg4qy5RqLWXmKM1RvTl moMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678887165; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gzBI6MS+HqRp/ea3v56OH39qhwymvDsQuCpyq4SFmtc=; b=ELJIUEmrwUCm+vbCBiHYRuLBcf8r0cMvfhbsuy6Kt1UCSNPtAloa2yJtObbvigEqt7 hCnaXN5aKtvb8Si1OhVz719MSDXekPyJl+CWXPPybba1ZyESAi8+s9RXa+kCCI7H+sfh dhkQSuuvzWyvXdyFf7KMhqV8Od7eXLQQWRDq1bk/yfp7PNTVi1YprR2uVtyL8nH06M+W mj0jSZft40Ccou/JxAPreym6UiCntid3k7zJc4788CwdMpafD8Zw7mEWZRYjCu/6B6rC xtYkpCjna4xrQ2o7Ap+TyS3feKSmGkuIg7hP4rAKif4TN+31SjiL9EyddCsy7yXC25f8 BScw== X-Gm-Message-State: AO0yUKXoanrSG85Gico+Gs2/4tgmmtFCf2G9QvRuKHQmpYdqZG21uH6K PWMrk/hPLn6CcTjHZzYenq6iAFMu9FzPgQ== X-Google-Smtp-Source: AK7set+vP/vxecy50txuIdS/hCPZhyc0aNy9UdcKQD174S6H0lX+3M6Nm+SDU7bpBhya2F5xbFIPng== X-Received: by 2002:a81:9145:0:b0:544:943a:adda with SMTP id i66-20020a819145000000b00544943aaddamr600396ywg.48.1678887165419; Wed, 15 Mar 2023 06:32:45 -0700 (PDT) Received: from hurd (dsl-10-135-114.b2b2c.ca. [72.10.135.114]) by smtp.gmail.com with ESMTPSA id i68-20020a378647000000b007416c11ea03sm3733217qkd.26.2023.03.15.06.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 06:32:45 -0700 (PDT) From: Maxim Cournoyer To: Leo Famulari Cc: Felix Lechner , guix-devel@gnu.org Subject: Re: Branch and release process References: <87lejzmisn.fsf@gmail.com> <87edpqlsza.fsf@gmail.com> <871qlqlmhf.fsf_-_@gmail.com> Date: Wed, 15 Mar 2023 09:32:44 -0400 In-Reply-To: (Efraim Flashner's message of "Wed, 15 Mar 2023 13:37:15 +0200") Message-ID: <87o7oujg1v.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::112a; envelope-from=maxim.cournoyer@gmail.com; helo=mail-yw1-x112a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: X-Migadu-Queue-Id: 124EA3B134 X-Spam-Score: -6.47 X-Migadu-Spam-Score: -6.47 X-Migadu-Scanner: scn0.migadu.com 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 X-TUID: /VU2IHPfE69n Hi Efraim, Efraim Flashner writes: > On Tue, Mar 14, 2023 at 11:30:52PM -0400, 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 >> >> >> >> 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? > > So we can group a couple of larger related changes together. I see; so it'd be useful for the integration of package changes impacting multiple others; some kind of staging or core-updates topic-focused branches. Simple leaf package updates could still be merged directly to master without going through the go-team branch, right? -- Thanks, Maxim