Re: [PATCH 8/8] ci: use Meson's new `--slice` option

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jul 07, 2025 at 09:39:35PM -0400, Jeff King wrote:
> On Mon, Jul 07, 2025 at 09:12:49PM -0400, Jeff King wrote:
> 
> > I was just digging into this, too. I guess:
> > 
> > diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> > index 673b1c44b9..717bd2763b 100644
> > --- a/.github/workflows/main.yml
> > +++ b/.github/workflows/main.yml
> > @@ -289,7 +289,7 @@ jobs:
> >      strategy:
> >        fail-fast: false
> >        matrix:
> > -        nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
> > +        nr: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
> >      concurrency:
> >        group: windows-meson-test-${{ matrix.nr }}-${{ github.ref }}
> >        cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
> > 
> > is probably the right fix?
> 
> That does renumber the job titles. Probably not important, but they
> wouldn't match the non-meson ones anymore (though I am not sure if we
> even slice in the same way, so maybe it does not matter at all).
> 
> Anyway, the more minimal fix is:
> 
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index 673b1c44b9..7739bd2d76 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -306,7 +306,7 @@ jobs:
>          path: build
>      - name: Test
>        shell: pwsh
> -      run: meson test -C build --no-rebuild --print-errorlogs --slice ${{ matrix.nr }}/10
> +      run: meson test -C build --no-rebuild --print-errorlogs --slice "$(1+${{ matrix.nr }})/10"
>  
>    regular:
>      name: ${{matrix.vector.jobname}} (${{matrix.vector.pool}})
> 
> with the additional bonus that I can put "PowerShell Hacker" on my
> resume now.
> 
> Curiously the quotes around the whole thing are required. If you do
> just:
> 
>   $(1+1)/10
> 
> you will get two arguments: "2" and "/10". Definitely surprising to me
> coming from a bourne shell background.

Thanks for digging into this! I probably should make it a habit to
always run CI changes through both GitHub and GitLab. :/

Patrick




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux