From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 eF1+FdAnkWSq+QAASxT56A (envelope-from ) for ; Tue, 20 Jun 2023 06:15:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EAmBFdAnkWQrOwEA9RJhRA (envelope-from ) for ; Tue, 20 Jun 2023 06:15:12 +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 1CD3A478CB for ; Tue, 20 Jun 2023 06:15:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBSlL-0002GP-DM; Tue, 20 Jun 2023 00:14: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 1qBSlH-0002G1-SQ for guix-devel@gnu.org; Tue, 20 Jun 2023 00:14: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 1qBSlG-000778-4d for guix-devel@gnu.org; Tue, 20 Jun 2023 00:14:35 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id E307327BBE2; Tue, 20 Jun 2023 05:14:30 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id bd17d460; Tue, 20 Jun 2023 04:14:29 +0000 (UTC) References: <87y1kuyqew.fsf@cbaines.net> <87o7lktodm.fsf@cbaines.net> <871qiaslx6.fsf@protonmail.com> <87edmal7jk.fsf@cbaines.net> <87wmzzqosu.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: Tue, 20 Jun 2023 04:52:09 +0100 In-reply-to: <87wmzzqosu.fsf@protonmail.com> Message-ID: <87a5wukbx9.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=1687234512; a=rsa-sha256; cv=none; b=l0Ce03OK4T1VWeVHTpWwWFXyZ4nTRLdx8TWsgLJryPV5bK/CA7ibLM96fXa2scMyCMY5BJ 0qSU89wMkS3zzODCapN5bEjuHsIRGXqOQCd9tF9kCblgEMHBFlH9RlemDb1a6hB+ZwsFzx bJJZ7zUJBTnRybF/XiIo0nYavBiF4h5lnemGUvW2eveZ32MaeCa96vARcazn1zgAGBxH8R E8dNrXliO4We/0oF6mZJFOhYpLX882lDTVlMLfvUaP9BNXraYlqo+OsDhP60cjCqY19n/V 13eejXHhPipjgLPdRgiC4lKjSB6W4N6EwEMCoRk19F2Xz0mYDJvIo/mfTR6VRQ== 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=1687234512; 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=IHfErsoPcNQ6DR4z+rrb1JKE27uRnl4PhVLA4G7o1Fk=; b=gPnH3uhScnazbPuCQ8/KT2GkfIyMH18TwSxYR+oqbjfVG5F4yLsgr7iproGlVLTQ37Z4dk hKcfNiVyejGPjkC1qurh/XvqY/U4bZ2D8p0BGkguxQ5aQVzySPxso3KfbPMONmCZgngvHH sF+nygCrr/vXgo3FffkWn8IcxL3rYsJTdeMFcz830KcZUlRMWQW1pLJqsTla/IZhX/odkV mSHrJE2go/NvkYVg326foHO/QFzYUxVhQmxLn3rjZx5qcrhuITkj78rMi9tXF8+uAQ4S0e nDZ0r4kuSN6w505K4FkSzl/aoKq6LKax6DsGf6hk1E8pEvEw9gYWeqfamDbrgg== 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.14 X-Spam-Score: -4.14 X-Migadu-Queue-Id: 1CD3A478CB X-TUID: V4JUC9qRgDb6 --=-=-= Content-Type: text/plain John Kehayias writes: >>> 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. > > I'm confused myself over my wording, but I remember what I was trying > to get at: > > Currently QA doesn't build patches if they cause a large number of > rebuilds correct? So for building a branch that requires this, will > that only happen on Cuirass with a new jobspec for the branch? Or will > this be addressed through changes to how QA builds? (Maybe this > answered below actually.) Yep, for issues there's a cap of 300 builds per system. QA does build the branch at the front of the queue to be merged though, currently that's ruby-team [1]. 1: https://qa.guix.gnu.org/ >>> 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: >> > > A separate issue which I wanted to get at was about pushing changes to > any branch on Savannah. Do we expect those to be at the same state as > anything that would go directly to master, just pending the testing of > builds basically? So, after the usual review period? Or can those be > more WIP and not polished yet? I suppose this is for a team/people > working on a branch to discuss and how it will then be merged to > master. The latter. Non-master branches can be in whatever state is useful. >> 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. >> > > I see, that's a nice way to then group up discussion if a branch has a > bunch of separate patch threads. Looks like a good idea! > > So, to be concrete, with the mesa patch I just sent, > I can open a merge request issue for > QA to process the branch, once the branch is actually created on > Savannah? I assume with the pretty trivial version change here I could > do that to see how the builds go, but I'll hold off pending the thread > I just started about this branch/team. Currently QA just builds the branch at the front of the queue, but yes. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSRJ6JfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdD9Q//WQ1N7+a+ztqKQRlZsdYGD9S/5xkXd+d5 wY7XscTvP3/9in6JAp82mMcHdoYYP9u5N2LCfF76FI6IapoVYKwIs5B+pnbTNGFb tWpjVDJdEjqhjRuPdJq232/Z2zMS7+znlxNROTEEZvvqdQWauSygHbEU16mag9Wn p6QYyqIMj1ahKAvHLW63gLSYMKXwbv3CHQNCImf7MYW3eScmQDY3YWOpxCRa1/kr HHl49VPdayHICyLg19ygDayGu0e088NgTOls3kN+KZR0oIWsOPPT05e8jbvkqy/q QT2VE6U7ccTKhK+1/bS2NhuRL0kMHqQ3gGdeNnj8ZiQM6EvSvzQfYASROyqpkPQ4 QICfWW91ivJFXGUjrSD6yqRTq2HXrh+w+iFtsvR91bsn8x/f+O6RX01BX0kZDH9N Z4Y/ovDTdUK8pCKnPMLKNcOCkJEZxGKPK+qG4x4DN1zukVGl4EKM9Pi6V7j9EsWk CUuk29f304dtHUv64q2JvEAGf4X7Lw3B+cgMztRgqZyHPN7wG+Na3r03pRjTNnpt Z+M9dPj/9Gkt+6JWz47EaO2XrhXFXOPunZDW93awLPpuYRRbUsAoLbdYdlqo6sc1 GWbJIuQNUlB5KW+VrZZsQz8g+JS7LOl/UrAU/o15ed43JdTOIoWV7kASzr+rRqHo Y21O5hihPjA= =cldl -----END PGP SIGNATURE----- --=-=-=--