]> git.ipfire.org Git - thirdparty/git.git/commitdiff
ci: fix propagating UTF-8 test locale in musl-based Meson job
authorPatrick Steinhardt <ps@pks.im>
Tue, 18 Feb 2025 07:45:59 +0000 (08:45 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Feb 2025 15:49:52 +0000 (07:49 -0800)
The musl-based Meson job is supposed to explicitly specify the UTF-8
locale used for testing, which has been introduced with 84bb5eeace7 (ci:
switch linux-musl to use Meson, 2025-01-28). That commit had two issues
though:

  - We continue to refer to "linux-musl", even though the job has been
    renamed in the same commit to "linux-musl-meson".

  - We use the wrong option name to specify the locale. This was not
    noticed though due to the first issue.

Fix both of these issues by fixing both the job and option naems.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ci/lib.sh

index 028fea0e7b52d8e39e3a12ff5a6cc02bd0695840..84d1145265081d233f21b895fbf3f04192f6c424 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -348,8 +348,8 @@ case "$jobname" in
 linux32)
        CC=gcc
        ;;
-linux-musl)
-       MESONFLAGS="$MESONFLAGS -DGIT_TEST_UTF8_LOCALE=C.UTF-8"
+linux-musl-meson)
+       MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8"
        ;;
 linux-leaks|linux-reftable-leaks)
        export SANITIZE=leak