Skip to content

Commit c3bc449

Browse files
sgngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5a33f54 commit c3bc449

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

ci/install-docker-dependencies.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ Linux32)
2323
;;
2424
esac
2525

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"
3227

3328
# If this script runs inside a docker container, then all commands are
3429
# usually executed as root. Consequently, the host user might not be

0 commit comments

Comments
 (0)