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>
Đoàn Trần Công Danh committed
Apr 4, 2020 at 08:08 UTC
c3bc449eb1b8b458e812c07eb8d0cb643f3d1b36
2 files changed
+15
-6
ci/install-docker-dependencies.sh
new
+14
@@ -0,0 +1,14 @@
1
+#!/bin/sh
2
+#
3
+# Install dependencies required to build and test Git inside container
4
+#
5
+
6
+case "$jobname" in
7
+Linux32)
8
+ linux32 --32bit i386 sh -c '
9
+ apt update >/dev/null &&
10
+ apt install -y build-essential libcurl4-openssl-dev \
11
+ libssl-dev libexpat-dev gettext python >/dev/null
12
+ '
13
+ ;;
14
+esac
ci/run-docker-build.sh
+1
-6
@@ -23,12 +23,7 @@ Linux32)
23
;;
24
esac
25
26
-# Update packages to the latest available versions
27
-command $switch_cmd sh -c '
28
- apt update >/dev/null &&
29
- apt install -y build-essential libcurl4-openssl-dev libssl-dev \
30
- libexpat-dev gettext python >/dev/null
31
-'
26
+"${0%/*}/install-docker-dependencies.sh"
27
28
# If this script runs inside a docker container, then all commands are
29
# usually executed as root. Consequently, the host user might not be