Re: git: 6024564cd4da - main - Cirrus-CI: split main script into separate world + kernel

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