Date: Fri, 9 Jun 2023 08:26:40 -0700 From: Alexander Richardson <arichardson@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 6024564cd4da - main - Cirrus-CI: split main script into separate world + kernel Message-ID: <CA%2BZ_v8pYMFEmLgGVcsSK0YoKJhKTvTUoTySO8=1j4Ur2SkGAUw@mail.gmail.com> In-Reply-To: <202306091508.359F8gu5093953@gitrepo.freebsd.org> References: <202306091508.359F8gu5093953@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000007a137805fdb3ff84 Content-Type: text/plain; charset="UTF-8" On Fri, 9 Jun 2023, 08:08 Ed Maste, <emaste@freebsd.org> wrote: > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=6024564cd4da1f7a24c7e13a4aa6b04707eafb60 > > commit 6024564cd4da1f7a24c7e13a4aa6b04707eafb60 > Author: Ed Maste <emaste@FreeBSD.org> > AuthorDate: 2023-06-09 13:53:08 +0000 > Commit: Ed Maste <emaste@FreeBSD.org> > 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 <div dir=3D"auto"><div><br><div class=3D"gmail_quote"><div dir=3D"ltr" clas= s=3D"gmail_attr">On Fri, 9 Jun 2023, 08:08 Ed Maste, <<a href=3D"mailto:= emaste@freebsd.org">emaste@freebsd.org</a>> wrote:<br></div><blockquote = class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid= ;padding-left:1ex">The branch main has been updated by emaste:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D6024564cd4da1f7a2= 4c7e13a4aa6b04707eafb60" rel=3D"noreferrer noreferrer" target=3D"_blank">ht= tps://cgit.FreeBSD.org/src/commit/?id=3D6024564cd4da1f7a24c7e13a4aa6b04707e= afb60</a><br> <br> commit 6024564cd4da1f7a24c7e13a4aa6b04707eafb60<br> Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><br> AuthorDate: 2023-06-09 13:53:08 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><br> CommitDate: 2023-06-09 15:07:24 +0000<br> <br> =C2=A0 =C2=A0 Cirrus-CI: split main script into separate world + kernel<br> <br> =C2=A0 =C2=A0 It appears that Cirrus-CI has a 100MB limit for log output, a= nd we<br> =C2=A0 =C2=A0 exceed that (!) with the amd64-gcc12 build.=C2=A0 Separate wo= rld and kernel<br> =C2=A0 =C2=A0 build tasks in an attempt to stay below the limit.<br> <br> =C2=A0 =C2=A0 This also has the benefit of showing world and kernel build s= tatus<br> =C2=A0 =C2=A0 separately in the Cirrus-CI UI.<br> <br> =C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0271903<br> =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation<br> ---<br> =C2=A0.cirrus.yml | 7 +++++--<br> =C2=A01 file changed, 5 insertions(+), 2 deletions(-)<br> <br> diff --git a/.cirrus.yml b/.cirrus.yml<br> index 12d78f465c55..d22b5f189f53 100644<br> --- a/.cirrus.yml<br> +++ b/.cirrus.yml<br> @@ -73,8 +73,11 @@ task:<br> =C2=A0 =C2=A0- mkdir -p /usr/obj/$(pwd -P)<br> =C2=A0 =C2=A0- chown user:user /usr/obj/$(pwd -P)<br> <br> -=C2=A0 script:<br> -=C2=A0 - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=3D${= TOOLCHAIN} WITHOUT_TOOLCHAIN=3Dyes buildworld buildkernel"<br> +=C2=A0 build_world_script:<br> +=C2=A0 - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=3D${= TOOLCHAIN} WITHOUT_TOOLCHAIN=3Dyes buildworld"<br> +<br> +=C2=A0 build_kernel_script:<br> +=C2=A0 - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=3D${= TOOLCHAIN} WITHOUT_TOOLCHAIN=3Dyes buildkernel"<br></blockquote></div>= </div><div dir=3D"auto"><br></div><div dir=3D"auto">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.</div><div dir=3D"auto"= ><br></div><div dir=3D"auto">Alex=C2=A0</div></div> --0000000000007a137805fdb3ff84--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2BZ_v8pYMFEmLgGVcsSK0YoKJhKTvTUoTySO8=1j4Ur2SkGAUw>