From nobody Fri Jun 9 15:26:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qd4gd522Cz4bBnb; Fri, 9 Jun 2023 15:26:53 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qd4gd2FnJz3LHl; Fri, 9 Jun 2023 15:26:53 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vk1-f175.google.com with SMTP id 71dfb90a1353d-465df1ad8c5so410479e0c.2; Fri, 09 Jun 2023 08:26:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686324412; x=1688916412; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=90ktA/aOPypdvkvfzoofHK08xR3zxks01BTs603XDEQ=; b=ZE9NpJKglorDExg3On/rBmNx9LTU572LfbuLOZP7yGACuHTSySrm6Sc8aYEkdzc3Nw /dEindFk92siZgFvSBbanipPf+AuPPesNADIWlnO/alp1K2pg4HdHm5gsat6XVTA37xN nai+2P/kc5g9aSWdINzX1HiHJFx6gwrRNpxu8eZnzL5z2q/rOdGN1McFpSHB24p3rODu C+NOZZ3RcrlKgYmnSaMchOC2e0mA9gGCglLlYx5LuXlQNQJZwvMG0u/VK33ehP121olQ w5JeYpG4xZ9kT1C9KRjQrjvCfcKSssyCEbWMgKHp0+AR5o0PwsTUTF4kXIzObyyHVpDu Cglw== X-Gm-Message-State: AC+VfDwF3rTAa+fcHVTxdRyYl9Sudll73JWMeYl+Hqsrk7an60ViQbID 5Gv1zCCviFPl3o0RfRJt3idNgDxik/E= X-Google-Smtp-Source: ACHHUZ6aMFTeTSJ7/U/ABCJb+alZUkPMTMKM0upkN2dH86ox0maOBZfvCvNalcj5QPLmN3Lk4ikbOw== X-Received: by 2002:a67:b342:0:b0:43b:ee9f:69dd with SMTP id b2-20020a67b342000000b0043bee9f69ddmr634399vsm.10.1686324411978; Fri, 09 Jun 2023 08:26:51 -0700 (PDT) Received: from mail-vk1-f171.google.com (mail-vk1-f171.google.com. [209.85.221.171]) by smtp.gmail.com with ESMTPSA id k16-20020a67c290000000b00437d925eefcsm571502vsj.32.2023.06.09.08.26.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Jun 2023 08:26:51 -0700 (PDT) Received: by mail-vk1-f171.google.com with SMTP id 71dfb90a1353d-45d1c1404easo407957e0c.1; Fri, 09 Jun 2023 08:26:51 -0700 (PDT) X-Received: by 2002:a1f:3dd3:0:b0:465:8d1c:d2dd with SMTP id k202-20020a1f3dd3000000b004658d1cd2ddmr714649vka.10.1686324410714; Fri, 09 Jun 2023 08:26:50 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202306091508.359F8gu5093953@gitrepo.freebsd.org> In-Reply-To: <202306091508.359F8gu5093953@gitrepo.freebsd.org> From: Alexander Richardson Date: Fri, 9 Jun 2023 08:26:40 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 6024564cd4da - main - Cirrus-CI: split main script into separate world + kernel To: Ed Maste Cc: src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007a137805fdb3ff84" X-Rspamd-Queue-Id: 4Qd4gd2FnJz3LHl X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000007a137805fdb3ff84 Content-Type: text/plain; charset="UTF-8" On Fri, 9 Jun 2023, 08:08 Ed Maste, wrote: > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=6024564cd4da1f7a24c7e13a4aa6b04707eafb60 > > commit 6024564cd4da1f7a24c7e13a4aa6b04707eafb60 > Author: Ed Maste > AuthorDate: 2023-06-09 13:53:08 +0000 > Commit: Ed Maste > CommitDate: 2023-06-09 15:07:24 +0000 > > Cirrus-CI: split main script into separate world + kernel > > It appears that Cirrus-CI has a 100MB limit for log output, and we > exceed that (!) with the amd64-gcc12 build. Separate world and kernel > build tasks in an attempt to stay below the limit. > > This also has the benefit of showing world and kernel build status > separately in the Cirrus-CI UI. > > PR: 271903 > Sponsored by: The FreeBSD Foundation > --- > .cirrus.yml | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/.cirrus.yml b/.cirrus.yml > index 12d78f465c55..d22b5f189f53 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -73,8 +73,11 @@ task: > - mkdir -p /usr/obj/$(pwd -P) > - chown user:user /usr/obj/$(pwd -P) > > - script: > - - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} > WITHOUT_TOOLCHAIN=yes buildworld buildkernel" > + build_world_script: > + - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} > WITHOUT_TOOLCHAIN=yes buildworld" > + > + build_kernel_script: > + - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} > WITHOUT_TOOLCHAIN=yes buildkernel" > Maybe these commands should just be using make -s? I believe make should now print the failed command so there should be no need to print all of them. Alex --0000000000007a137805fdb3ff84 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Fri, 9 Jun 2023, 08:08 Ed Maste, <emaste@freebsd.org> wrote:
The branch main has been updated by emaste:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D6024564cd4da1f7a24c7e13a4aa6b04707e= afb60

commit 6024564cd4da1f7a24c7e13a4aa6b04707eafb60
Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-06-09 13:53:08 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-06-09 15:07:24 +0000

=C2=A0 =C2=A0 Cirrus-CI: split main script into separate world + kernel

=C2=A0 =C2=A0 It appears that Cirrus-CI has a 100MB limit for log output, a= nd we
=C2=A0 =C2=A0 exceed that (!) with the amd64-gcc12 build.=C2=A0 Separate wo= rld and kernel
=C2=A0 =C2=A0 build tasks in an attempt to stay below the limit.

=C2=A0 =C2=A0 This also has the benefit of showing world and kernel build s= tatus
=C2=A0 =C2=A0 separately in the Cirrus-CI UI.

=C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0271903
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation
---
=C2=A0.cirrus.yml | 7 +++++--
=C2=A01 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 12d78f465c55..d22b5f189f53 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -73,8 +73,11 @@ task:
=C2=A0 =C2=A0- mkdir -p /usr/obj/$(pwd -P)
=C2=A0 =C2=A0- chown user:user /usr/obj/$(pwd -P)

-=C2=A0 script:
-=C2=A0 - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=3D${= TOOLCHAIN} WITHOUT_TOOLCHAIN=3Dyes buildworld buildkernel"
+=C2=A0 build_world_script:
+=C2=A0 - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=3D${= TOOLCHAIN} WITHOUT_TOOLCHAIN=3Dyes buildworld"
+
+=C2=A0 build_kernel_script:
+=C2=A0 - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=3D${= TOOLCHAIN} WITHOUT_TOOLCHAIN=3Dyes buildkernel"
=

Maybe these commands sh= ould just be using make -s? I believe make should now print the failed comm= and so there should be no need to print all of them.

Alex=C2=A0
--0000000000007a137805fdb3ff84--