From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id AKqECJGr5mW0aAEA62LTzQ:P1 (envelope-from ) for ; Tue, 05 Mar 2024 06:20:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id AKqECJGr5mW0aAEA62LTzQ (envelope-from ) for ; Tue, 05 Mar 2024 06:20:17 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=R8dPDdOq; 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"; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709616017; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=DWzVsyqHW/F5/ODpY2gLr3UYz0+yETsrYnp8v7maTM4=; b=W5gUmXEhcMdaxfcmMjkUwOZxaTj3M+4YwlG5ukj1jaXesWqsjAlxgvhrUnO879AOMahGaf iuNasbHRFzCwglG9cqb58kof3UCWjRAS9nutuzyFc82e6aTQxr+xA/zQK+aQ+fg7DfsC+P ooHz06dwgMWDS8fzXuzFxVZOANz7BrosWGhLfrPOHJzfo18g4pOYKPiCVy7FxLJ3XTeUxM PLupGY7nIWCdxUQ90K5nNXyrrYdDFD8t+Dx0KQGh4YCecsoNXRZ8tziZc9b+RRgmPfbg6l gJ6c25Y0+rB1N7RvLP81ObHM/4fQCXySbW1rYIblcMu9f2SZf7RO+Zs6Ie4sVg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=R8dPDdOq; 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"; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709616017; a=rsa-sha256; cv=none; b=UEXluJVNBSAM0VmhtVwW/vcue6sJpXzmhvoW7yHQWHmi5yf/dfkdXG6Bl7FoeR+akGgsLm +vw5aktTW99VtPCngICt9lX691rzApBP7nQYoRs3qI+Xd9Mph4POhivrC2Rhq69SNtRhyb 2X3s7KL7rjzdXFAl2hQ3vgEoqBq2aJTE6QchDe9S8ha8nfsIbJEAgvDh9fjWzYEDhI+LIH 9pFi9MfV/0zW2HIKJq4ZbE+tjXjMpfS1XkfuASAgqrFusjqZ74c8StMR0vb2ZZb3r17HdS PApDBf/JObnX0maPHxSWbrzligOYmbK5nRCMush04CVQa+GEM+JmLIgz0nt+4w== 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 06B1A36AD3 for ; Tue, 5 Mar 2024 06:20:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhNDS-0005xT-4I; Tue, 05 Mar 2024 00:19:50 -0500 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 1rhNDJ-0005sF-M0 for guix-devel@gnu.org; Tue, 05 Mar 2024 00:19:42 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhNDG-0006ld-Tw for guix-devel@gnu.org; Tue, 05 Mar 2024 00:19:41 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a458850dbddso119248966b.0 for ; Mon, 04 Mar 2024 21:19:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709615975; x=1710220775; darn=gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=DWzVsyqHW/F5/ODpY2gLr3UYz0+yETsrYnp8v7maTM4=; b=R8dPDdOqqlxMmIq3TwEa3gVwAgeORLE0AaKWMc1d+7roGUNxL+i3KPNnFiPDTD/SrF y9zV/mKw8mceilB2BWoThpsDzQXGmipO0kd/GrHg82h40s0m71vXXbiASHUIth02rRDH XkP8Nm/AKrsb7jNCQRxH9ejCr7vC7MzQplIVy0koO26LXqf2TgQPiHR0ISQ4TgvSQrys +sOxq0gkGw6fCP54LS6KQfB0qZhdD/vjqI5i+E+yzCBBrD/RXoSC8eOQaB3voekI+KU7 8CsUAscUmcHhfjGSHA38ysIjBghCkgBQQeaVDQp9TUI7PEQn0ID//vTPc50vZzjhIqKw gq5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709615975; x=1710220775; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DWzVsyqHW/F5/ODpY2gLr3UYz0+yETsrYnp8v7maTM4=; b=eWUZl5LO0uyM4CfmibzVdtLON5vTj72EXcyfz0giR1CqlEMA4PrDnku90ANRQzYmOE 47/AQm0a0yRwvFNhIXfLN5OHs4NWmJzqPW9zu4eXf6bG5Ic4xJ20IT0gSQ6hyO9iQSAB yuggkQMVE9Dr/rCGRaAY5bGsIt244DQNHl9DUJ0DgIsr8j5At919qcpCY3uS4Wm9k19q 7ykLJj/uhneJfVlQsyq47D+ue4ddRz1VwMvWnDSZu9taX19PqcXhxB2vFvVMWr5+V7C8 gaQ4UoutB3gbFQ91YQgA9RsJ5jxSaSah68diwRlXftWnl/XdQ0yxSw6rE+9xc339WgZ6 Ugeg== X-Forwarded-Encrypted: i=1; AJvYcCUb6HcPTOeS5Kto4366vAZT/fCW0zIYVpJL8JBPx3iOZD0z0EY/L7i804DtebzUNz3PMQkdPT0LU+j7+h9o4kKP0KY= X-Gm-Message-State: AOJu0Yw6X/mC2hIUW/Sox5ajZgWCmiiexbd3b+G7iFSWL5W6H8uXAu8e X+oADXhBGiRyz7U7dca/L3RKBqU3MBBYeyFAgVupwPyQ1iGnO6IBAFxHMz1NIJc= X-Google-Smtp-Source: AGHT+IFIWiuAAWDnwYPUHIpOY3Hun7b2cjnzfngVxYDi1EPOY8UFXvuG3e9ZPioO9Vgxh8oPNDzORw== X-Received: by 2002:a17:907:1186:b0:a3e:9def:5ed5 with SMTP id uz6-20020a170907118600b00a3e9def5ed5mr7298700ejb.33.1709615974357; Mon, 04 Mar 2024 21:19:34 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id oy29-20020a170907105d00b00a43fe57b2basm5600466ejb.61.2024.03.04.21.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 21:19:33 -0800 (PST) Message-ID: Subject: Re: Should commits rather be buildable or small From: Liliana Marie Prikler To: John Kehayias , Ricardo Wurmus Cc: Attila Lendvai , Philip McGrath , Saku Laesvuori , guix-devel@gnu.org, dan , 69461@debbugs.gnu.org Date: Tue, 05 Mar 2024 06:19:32 +0100 In-Reply-To: <87jzmhad9s.fsf@protonmail.com> References: <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@gmail.com> <875y16c54b.fsf@elephly.net> <87fs09ar56.fsf@elephly.net> <87jzmhad9s.fsf@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x641.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, 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 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -9.56 X-Spam-Score: -9.56 X-Migadu-Queue-Id: 06B1A36AD3 X-TUID: 1/M+jji+5AvH Hi, Am Montag, dem 04.03.2024 um 21:38 +0000 schrieb John Kehayias: > [...] > 1. Essentially squash to one commit where all of vulkan is updated in > one commit. The main upside is that nothing should break (within > vulkan, dependents to be fixed as needed) and it shows as "one" > change; the main downside is that the proposed changes are not just > trivial version bumps. Harder to then disentangle as needed. >=20 > 2. Make each commit updating a package, but don't use the variable > %vulkan-sdk-version, updating each package with a version as it is > done. Then do a commit where all the versions are replaced by the > variable. This seems like unnecessary work to me and while it stops > the obvious breaking (source hashes don't match once variable is > updated but package hasn't yet) versions are still mixed which is > likely a problem. >=20 > 3. Go with the series as proposed: this means after the first commit > for sure all other vulkan packages and dependents don't build, as the > source hashes won't match until the commit that updates that package. > Along with version mixing, this perhaps doesn't give you a helpful > git bisect either? >=20 > None are perfect. What do people think? I think 1 would be workable if the changes to the packages are minimal. You should also check whether you can just do the version bumps and then the other changes =E2=80=93 or flip the order. I don't really see the benefit with 2. Normally, we'd have "-next" variants to catch nontrivial updates (among other things), but those don't seem a good approach here. If nothing else works, 3 is indeed an option to fall back to, albeit begrudgingly. As noted for 1, you could check whether bumping all the hashes and then only fixing whatever else for the builds is an option here. Alternative 4 would be to build those -next variants and then replace the base vulkan all at once. This has the advantage of not doing any version mixing in-between IIUC. Cheers