diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:45 -0800 |
| commit | 9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0 (patch) | |
| tree | 54481fadf7f95c85d003db2a4b591ce51cb266d5 /ci | |
| parent | Merge branch 'js/bundle-unbundle-fd-reuse-fix' (diff) | |
| parent | ci: make "linux-musl" job use zlib-ng (diff) | |
| download | git-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.tar.gz git-9d0e81e2ae3bd7f6d8a655be53c2396d7af3d2b0.zip | |
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')
| -rwxr-xr-x | ci/install-dependencies.sh | 4 | ||||
| -rwxr-xr-x | ci/lib.sh | 5 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d5a959e25f..332ba96003 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -24,8 +24,8 @@ fi case "$distro" in alpine-*) - apk add --update shadow sudo build-base curl-dev openssl-dev expat-dev gettext \ - pcre2-dev python3 musl-libintl perl-utils ncurses \ + apk add --update shadow sudo meson ninja-build gcc libc-dev curl-dev openssl-dev expat-dev gettext \ + zlib-ng-dev pcre2-dev python3 musl-libintl perl-utils ncurses \ apache2 apache2-http2 apache2-proxy apache2-ssl apache2-webdav apr-util-dbd_sqlite3 \ bash cvs gnupg perl-cgi perl-dbd-sqlite perl-io-tty >/dev/null ;; @@ -349,10 +349,7 @@ linux32) CC=gcc ;; linux-musl) - CC=gcc - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3 USE_LIBPCRE2=Yes" - MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes" - MAKEFLAGS="$MAKEFLAGS GIT_TEST_UTF8_LOCALE=C.UTF-8" + MESONFLAGS="$MESONFLAGS -DGIT_TEST_UTF8_LOCALE=C.UTF-8" ;; linux-leaks|linux-reftable-leaks) export SANITIZE=leak 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 |