Re: [PATCH 5/7] ci: make test slicing consistent across Meson/Make

From

Johannes Schindelin <johannes.schindelin@gmx.de>

Date

Feb 18, 2026, 21:32 UTC

Message-ID

<83168201-9c26-4ece-51e1-1931d4b38443@gmx.de>

In-Reply-To

<20260211-b4-pks-ci-meson-improvements-v1-5-cb167cc80b86@pks.im>

Hi Patrick,

On Wed, 11 Feb 2026, Patrick Steinhardt wrote:

> In the preceding commit we have adjusted test slicing to be one-based
> when using the "ci/run-test-slice.sh" script. But we also have an
> equivalent script for Meson that is still zero-based, which is of course
> inconsistent.
> 
> Adapt the script to be one-based, as well, and adapt the GitHub workflow
> accordingly. Note that GitLab doesn't yet use the script, so it does not
> need to be adapted. This will change in the next commit though.

This seems to require the following to be squashed in:

-- snip --
From 677370c8cd3b73358713a0efac6bb573b347d53f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 18 Feb 2026 22:12:27 +0100
Subject: [PATCH] fixup??? ci: make test slicing consistent across Meson/Make

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 412842eb3e2..42585fff779 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -240,7 +240,7 @@ jobs:
       shell: bash
       env:
         NO_SVN_TESTS: 1
-      run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
+      run: . /etc/profile && ci/run-test-slice.sh $((${{matrix.nr}}+1)) 10
     - name: print test failures
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
       shell: bash
-- snap --

This here run proves that this change fixes the CI failure:
https://github.com/git-for-windows/git/actions/runs/22157880378/job/64067214717#step:5:70

Patrick, would you mind adopting this amendment into your patch?

Thank you,
Johannes

> 
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  .github/workflows/main.yml | 2 +-
>  ci/run-test-slice-meson.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index 76ef513e72..352357965b 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -298,7 +298,7 @@ jobs:
>          path: build
>      - name: Test
>        shell: bash
> -      run: ci/run-test-slice-meson.sh build ${{matrix.nr}} 10
> +      run: ci/run-test-slice-meson.sh build $((${{matrix.nr}} + 1)) 10
>      - name: print test failures
>        if: failure() && env.FAILED_TEST_ARTIFACTS != ''
>        shell: bash
> diff --git a/ci/run-test-slice-meson.sh b/ci/run-test-slice-meson.sh
> index 961c94fba0..a6df927ba5 100755
> --- a/ci/run-test-slice-meson.sh
> +++ b/ci/run-test-slice-meson.sh
> @@ -9,5 +9,5 @@
>  
>  group "Run tests" \
>  	meson test -C "$1" --no-rebuild --print-errorlogs \
> -		--test-args="$GIT_TEST_OPTS" --slice "$((1+$2))/$3" ||
> +		--test-args="$GIT_TEST_OPTS" --slice "$(($2))/$3" ||
>  handle_failed_tests
> 
> -- 
> 2.53.0.295.g64333814d3.dirty
> 
> 
>