diff options
| author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2020-04-04 08:08:49 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-06 13:44:42 -0700 |
| commit | c3bc449eb1b8b458e812c07eb8d0cb643f3d1b36 (patch) | |
| tree | 38f16decdef247860fedb8cead7aba423ce99eb9 /ci | |
| parent | 5a33f541ddb52e3f45db87db7c3dd40945b9a564 (diff) | |
| download | git-c3bc449eb1b8b458e812c07eb8d0cb643f3d1b36.tar.gz | |
ci/linux32: libify install-dependencies step
In a later patch, we will add new Travis Job for linux-musl.
Most of other code in this file could be reuse for that job.
Move the code to install dependencies to a common script.
Should we add new CI system that can run directly in container,
we can reuse this script for installation step.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-docker-dependencies.sh | 14 | ||||
| -rwxr-xr-x | ci/run-docker-build.sh | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh new file mode 100755 index 0000000000..a104c61d29 --- /dev/null +++ b/ci/install-docker-dependencies.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Install dependencies required to build and test Git inside container +# + +case "$jobname" in +Linux32) + linux32 --32bit i386 sh -c ' + apt update >/dev/null && + apt install -y build-essential libcurl4-openssl-dev \ + libssl-dev libexpat-dev gettext python >/dev/null + ' + ;; +esac diff --git a/ci/run-docker-build.sh b/ci/run-docker-build.sh index a05b48c559..4a153492ba 100755 --- a/ci/run-docker-build.sh +++ b/ci/run-docker-build.sh @@ -23,12 +23,7 @@ Linux32) ;; esac -# Update packages to the latest available versions -command $switch_cmd sh -c ' - apt update >/dev/null && - apt install -y build-essential libcurl4-openssl-dev libssl-dev \ - libexpat-dev gettext python >/dev/null -' +"${0%/*}/install-docker-dependencies.sh" # If this script runs inside a docker container, then all commands are # usually executed as root. Consequently, the host user might not be |