From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Dec 2023 00:37:48 +0000 (-0800)
Subject: Merge branch 'ps/ci-gitlab'
X-Git-Tag: v2.44.0-rc0~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14a4445d18eccc146b3340c2bdeeb15c81538938;p=thirdparty%2Fgit.git

Merge branch 'ps/ci-gitlab'

Add support for GitLab CI.

* ps/ci-gitlab:
  ci: add support for GitLab CI
  ci: install test dependencies for linux-musl
  ci: squelch warnings when testing with unusable Git repo
  ci: unify setup of some environment variables
  ci: split out logic to set up failed test artifacts
  ci: group installation of Docker dependencies
  ci: make grouping setup more generic
  ci: reorder definitions for grouping functions
---

14a4445d18eccc146b3340c2bdeeb15c81538938
diff --cc t/lib-httpd.sh
index 03493ee72b,9ea74927c4..d83bafeab3
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@@ -76,9 -68,9 +76,10 @@@ for DEFAULT_HTTPD_MODULE_PATH in '/usr/
  				 '/usr/lib64/httpd/modules' \
  				 '/usr/lib/httpd/modules' \
  				 '/usr/libexec/httpd' \
 -				 '/usr/lib/apache2'
++				 '/usr/lib/apache2' \
 +				 "${DETECTED_HTTPD_ROOT:+${DETECTED_HTTPD_ROOT}/modules}"
  do
 -	if test -d "$DEFAULT_HTTPD_MODULE_PATH"
 +	if test -n "$DEFAULT_HTTPD_MODULE_PATH" && test -d "$DEFAULT_HTTPD_MODULE_PATH"
  	then
  		break
  	fi