aboutsummaryrefslogtreecommitdiff
path: root/ci/run-build-and-tests.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-02-06 14:56:45 -0800
committerJunio C Hamano <gitster@pobox.com>2025-02-06 14:56:45 -0800
commit9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0 (patch)
tree54481fadf7f95c85d003db2a4b591ce51cb266d5 /ci/run-build-and-tests.sh
parent9fad473faed7862855ced123de81a53fa27187d9 (diff)
parent78cdeed4c79d165c915e8de0355cc3fb7f5797c5 (diff)
downloadgit-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.tar.xz
Merge branch 'ps/zlib-ng'
The code paths to interact with zlib has been cleaned up in preparation for building with zlib-ng. * ps/zlib-ng: ci: make "linux-musl" job use zlib-ng ci: switch linux-musl to use Meson compat/zlib: allow use of zlib-ng as backend git-zlib: cast away potential constness of `next_in` pointer compat/zlib: provide stubs for `deflateSetHeader()` compat/zlib: provide `deflateBound()` shim centrally git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" compat: introduce new "zlib.h" header git-compat-util: drop `z_const` define compat: drop `uncompress2()` compatibility shim
Diffstat (limited to 'ci/run-build-and-tests.sh')
-rwxr-xr-xci/run-build-and-tests.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 03d10c61d5..1c69846723 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -56,7 +56,8 @@ case "$jobname" in
--fatal-meson-warnings \
--warnlevel 2 --werror \
--wrap-mode nofallback \
- -Dfuzzers=true
+ -Dfuzzers=true \
+ $MESONFLAGS
group "Build" meson compile -C build --
if test -n "$run_tests"
then