From: Andreas Enge <andreas@enge.fr>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: Christopher Baines <mail@cbaines.net>, guix-devel@gnu.org
Subject: Feature branches (was: 04/09: gnu: mesa: Update to 23.0.3)
Date: Mon, 8 May 2023 18:33:53 +0200 [thread overview]
Message-ID: <ZFkkcQ2MOpku9YaF@jurong> (raw)
In-Reply-To: <87v8h2vpdq.fsf@gmail.com>
Hello,
indeed someone™ should update the documentation to describe the new
process. Probably we should agree on one before doing that as well...
In principle all big updates should go through a feature branch now.
However, this does not solve the problem of limited build power in our
two build farms. Having feature branches that regroup several related
changes should help in not rebuilding too often. In principle it could
also be okay to regroup unrelated changes (mesa and gcc, for instance),
as long as responsibilities are clear. It should be known who is going
to act on what when breakages occur in the branch. And I think there
should be some kind of "branch manager" and a time frame for the merge
so that the branches are short lived. The goal is to avoid the core-updates
experience of random commits being dropped in the same place, while
hoping that someone at some later point will sort it all out.
So how about this suggestion:
A feature branch is created upon request by a team, with a branch manager
designated by the team. It is accompanied by a short description of what
the branch is supposed to achieve, and in which timeframe.
The branch manager has the responsibility to communicate regularly with
guix-devel on the state of the branch and on what remains to be done, and
requests to merge the branch to master once it is ready, and to subsequently
delete the branch.
This does not yet explain how the branches interact with continuous
integration. The branch manager may or may not have commit rights and may
or may not be able to create specifications for cuirass, so the full
process should take this into account.
As written in a different thread, right now I would also suggest to first
build the branch only on x86 and powerpc to not overload our few arm
machines, but this is a technical detail.
Andreas
next prev parent reply other threads:[~2023-05-08 16:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <168347913021.32190.10808857919894440138@vcs2.savannah.gnu.org>
[not found] ` <20230507170531.26A00C22F14@vcs2.savannah.gnu.org>
2023-05-08 1:41 ` 04/09: gnu: mesa: Update to 23.0.3 Christopher Baines
2023-05-08 12:08 ` Maxim Cournoyer
2023-05-08 12:56 ` Christopher Baines
2023-05-08 15:01 ` Maxim Cournoyer
2023-05-08 16:33 ` Andreas Enge [this message]
2023-05-08 17:01 ` Feature branches Maxim Cournoyer
2023-05-10 9:21 ` Andreas Enge
2023-05-10 13:23 ` Maxim Cournoyer
2023-05-10 13:40 ` Andreas Enge
2023-05-10 13:55 ` Andreas Enge
2023-05-11 4:49 ` Maxim Cournoyer
2023-05-08 17:15 ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-05-10 9:11 ` Andreas Enge
2023-05-10 11:30 ` Christopher Baines
2023-05-08 16:39 ` 04/09: gnu: mesa: Update to 23.0.3 Christopher Baines
2023-05-09 4:37 ` John Kehayias
2023-05-09 8:39 ` Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZFkkcQ2MOpku9YaF@jurong \
--to=andreas@enge.fr \
--cc=guix-devel@gnu.org \
--cc=mail@cbaines.net \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).