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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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 [-- Attachment #2 --] <div dir="auto"><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, 9 Jun 2023, 08:08 Ed Maste, <<a href="mailto:emaste@freebsd.org">emaste@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="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="https://cgit.FreeBSD.org/src/commit/?id=6024564cd4da1f7a24c7e13a4aa6b04707eafb60" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=6024564cd4da1f7a24c7e13a4aa6b04707eafb60</a><br>; <br> commit 6024564cd4da1f7a24c7e13a4aa6b04707eafb60<br> Author: Ed Maste <emaste@FreeBSD.org><br> AuthorDate: 2023-06-09 13:53:08 +0000<br> Commit: Ed Maste <emaste@FreeBSD.org><br> CommitDate: 2023-06-09 15:07:24 +0000<br> <br> Cirrus-CI: split main script into separate world + kernel<br> <br> It appears that Cirrus-CI has a 100MB limit for log output, and we<br> exceed that (!) with the amd64-gcc12 build. Separate world and kernel<br> build tasks in an attempt to stay below the limit.<br> <br> This also has the benefit of showing world and kernel build status<br> separately in the Cirrus-CI UI.<br> <br> PR: 271903<br> Sponsored by: The FreeBSD Foundation<br> ---<br> .cirrus.yml | 7 +++++--<br> 1 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> - mkdir -p /usr/obj/$(pwd -P)<br> - chown user:user /usr/obj/$(pwd -P)<br> <br> - script:<br> - - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld buildkernel"<br> + build_world_script:<br> + - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld"<br> +<br> + build_kernel_script:<br> + - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildkernel"<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">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.</div><div dir="auto"><br></div><div dir="auto">Alex </div></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2BZ_v8pYMFEmLgGVcsSK0YoKJhKTvTUoTySO8=1j4Ur2SkGAUw>