Skip to content

Commit 61432dd

Browse files
sgngitster
authored andcommitted
ci: explicit install all required packages
In a later patch, we will support GitHub Action. Explicitly install all of our build dependencies on Linux. Since GitHub Action's Linux VM hasn't installed our build dependencies. And there're no harm to reinstall them (in Travis) Signed-off-by: Đoàn Trần Công Danh <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 87b68db commit 61432dd

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

ci/install-dependencies.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77

88
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
99
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
10+
UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
11+
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
12+
libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
1013

1114
case "$jobname" in
1215
linux-clang|linux-gcc)
1316
sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
1417
sudo apt-get -q update
15-
sudo apt-get -q -y install language-pack-is libsvn-perl apache2
18+
sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
19+
$UBUNTU_COMMON_PKGS
1620
case "$jobname" in
1721
linux-gcc)
1822
sudo apt-get -q -y install gcc-8
@@ -59,15 +63,19 @@ osx-clang|osx-gcc)
5963
StaticAnalysis)
6064
sudo apt-get -q update
6165
sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
62-
libexpat-dev gettext
66+
libexpat-dev gettext make
6367
;;
6468
Documentation)
6569
sudo apt-get -q update
66-
sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
70+
sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make
6771

6872
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
6973
gem install --version 1.5.8 asciidoctor
7074
;;
75+
linux-gcc-4.8|GETTEXT_POISON)
76+
sudo apt-get -q update
77+
sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
78+
;;
7179
esac
7280

7381
if type p4d >/dev/null && type p4 >/dev/null

0 commit comments

Comments
 (0)