aboutsummaryrefslogtreecommitdiffstats
path: root/ci/lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 16:15:28 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-29 16:15:28 -0700
commitaf986863c1ae2e306d5627f4e42cc6d2cf2a057f (patch)
treee7cf9db4f41edc5b0da13029758587cfff62a7c8 /ci/lib.sh
parent3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc (diff)
parente0f8690dee7ec9373657eb2ecef9c8d88d0ece08 (diff)
downloadgit-af986863c1ae2e306d5627f4e42cc6d2cf2a057f.tar.gz
Merge branch 'dd/ci-musl-libc'
A new CI job to build and run test suite on linux with musl libc has been added. * dd/ci-musl-libc: travis: build and test on Linux with musl libc and busybox ci/linux32: libify install-dependencies step ci: refactor docker runner script ci/linux32: parameterise command to switch arch ci/lib-docker: preserve required environment variables ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
Diffstat (limited to 'ci/lib.sh')
-rwxr-xr-xci/lib.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index c3a8cd2104..87cd29bab6 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -198,6 +198,14 @@ osx-clang|osx-gcc)
GIT_TEST_GETTEXT_POISON)
export GIT_TEST_GETTEXT_POISON=true
;;
+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"
+ ;;
esac
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"