aboutsummaryrefslogtreecommitdiffstats
path: root/.github/workflows
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 /.github/workflows
parentMerge branch 'js/bundle-unbundle-fd-reuse-fix' (diff)
parentci: make "linux-musl" job use zlib-ng (diff)
downloadgit-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 '.github/workflows')
-rw-r--r--.github/workflows/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d76999d09..5f756dfc2e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -390,7 +390,7 @@ jobs:
- jobname: linux-meson
image: ubuntu:rolling
cc: gcc
- - jobname: linux-musl
+ - jobname: linux-musl-meson
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32