summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-29 16:15:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-29 16:15:28 -0700
commitaf986863c1ae2e306d5627f4e42cc6d2cf2a057f (patch)
treee7cf9db4f41edc5b0da13029758587cfff62a7c8 /.travis.yml
parentMerge branch 'dl/merge-autostash-rebase-quit-fix' (diff)
parenttravis: build and test on Linux with musl libc and busybox (diff)
downloadtgif-af986863c1ae2e306d5627f4e42cc6d2cf2a057f.tar.xz
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 '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index fc5730b085..0cfc3c3428 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,15 @@ matrix:
services:
- docker
before_install:
- script: ci/run-linux32-docker.sh
+ script: ci/run-docker.sh
+ - env: jobname=linux-musl
+ os: linux
+ compiler:
+ addons:
+ services:
+ - docker
+ before_install:
+ script: ci/run-docker.sh
- env: jobname=StaticAnalysis
os: linux
compiler: