Skip to content

Commit 235fe77

Browse files
pks-tgitster
authored andcommitted
ci: fix propagating UTF-8 test locale in musl-based Meson job
The musl-based Meson job is supposed to explicitly specify the UTF-8 locale used for testing, which has been introduced with 84bb5ee (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c1d6628 commit 235fe77

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ case "$jobname" in
348348
linux32)
349349
CC=gcc
350350
;;
351-
linux-musl)
352-
MESONFLAGS="$MESONFLAGS -DGIT_TEST_UTF8_LOCALE=C.UTF-8"
351+
linux-musl-meson)
352+
MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8"
353353
;;
354354
linux-leaks|linux-reftable-leaks)
355355
export SANITIZE=leak

0 commit comments

Comments
 (0)