summaryrefslogtreecommitdiff
path: root/ci/lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-07 22:16:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-07 22:16:30 -0700
commit54711243407791b188bf338e105cdc6d81ee4402 (patch)
tree25afcee788a5f7ce0151c98a18d91a5ac0aab142 /ci/lib.sh
parentMerge branch 'dd/test-with-busybox' into HEAD (diff)
parenttravis: build and test on Linux with musl libc and busybox (diff)
downloadtgif-54711243407791b188bf338e105cdc6d81ee4402.tar.xz
Merge branch 'dd/ci-musl-libc' into HEAD
* 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}"