From: Patrick Steinhardt <ps@pks.im>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Justin Tobler <jltobler@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH 5/7] ci: make test slicing consistent across Meson/Make
Date: Thu, 19 Feb 2026 07:18:27 +0100 [thread overview]
Message-ID: <aZarM9CeGjBqC3S3@pks.im> (raw)
In-Reply-To: <83168201-9c26-4ece-51e1-1931d4b38443@gmx.de>
On Wed, Feb 18, 2026 at 10:32:20PM +0100, Johannes Schindelin wrote:
> 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
>
> This seems to be needed to let the first "win+VS test" job pass. See
> https://github.com/git-for-windows/git/actions/runs/22153194896/job/64053953314#step:5:70
> ("fatal: slice must be in the range 1 <= slice <= 10, got '0'").
Huh, weird, why didn't I spot this myself? Oh, these tests don't execute
by default, right? That's why.
> 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?
Yup, looks obviously correct. Will squash in, thanks!
Patrick
next prev parent reply other threads:[~2026-02-19 6:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-11 10:34 [PATCH 0/7] Some assorted fixes for GitLab CI Patrick Steinhardt
2026-02-11 10:34 ` [PATCH 1/7] ci: handle failures of test-slice helper Patrick Steinhardt
2026-02-11 10:34 ` [PATCH 2/7] ci: don't skip smallest test slice in GitLab Patrick Steinhardt
2026-02-11 10:34 ` [PATCH 3/7] meson: fix MERGE_TOOL_DIR with "--no-bin-wrappers" Patrick Steinhardt
2026-02-11 10:34 ` [PATCH 4/7] github: fix Meson tests not executing at all Patrick Steinhardt
2026-02-11 10:34 ` [PATCH 5/7] ci: make test slicing consistent across Meson/Make Patrick Steinhardt
2026-02-18 21:32 ` Johannes Schindelin
2026-02-19 6:18 ` Patrick Steinhardt [this message]
2026-02-11 10:34 ` [PATCH 6/7] gitlab-ci: use "run-test-slice-meson.sh" Patrick Steinhardt
2026-02-11 10:34 ` [PATCH 7/7] gitlab-ci: handle failed tests on MSVC+Meson job Patrick Steinhardt
2026-02-11 10:54 ` [PATCH 0/7] Some assorted fixes for GitLab CI Patrick Steinhardt
2026-02-11 16:52 ` Junio C Hamano
2026-02-19 6:25 ` [PATCH v2 " Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 1/7] ci: handle failures of test-slice helper Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 2/7] ci: don't skip smallest test slice in GitLab Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 3/7] meson: fix MERGE_TOOL_DIR with "--no-bin-wrappers" Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 4/7] github: fix Meson tests not executing at all Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 5/7] ci: make test slicing consistent across Meson/Make Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 6/7] gitlab-ci: use "run-test-slice-meson.sh" Patrick Steinhardt
2026-02-19 6:25 ` [PATCH v2 7/7] gitlab-ci: handle failed tests on MSVC+Meson job Patrick Steinhardt
2026-02-19 18:24 ` [PATCH v2 0/7] Some assorted fixes for GitLab CI Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aZarM9CeGjBqC3S3@pks.im \
--to=ps@pks.im \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jltobler@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.