@matheusbsbs / matheus-bagliano / commits / 61432dd630
Fork 0

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 <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Đoàn Trần Công Danh committed Apr 11, 2020 at 00:18 UTC 61432dd630e3f1711a44be2da2923ae071f96784
1 file changed +11 -3
ci/install-dependencies.sh
+11 -3
@@ -7,12 +7,16 @@
7
8 P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
9 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"
13
14 case "$jobname" in
15 linux-clang|linux-gcc)
16 sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
17 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
20 case "$jobname" in
21 linux-gcc)
22 sudo apt-get -q -y install gcc-8
@@ -59,15 +63,19 @@ osx-clang|osx-gcc)
63 StaticAnalysis)
64 sudo apt-get -q update
65 sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
62 - libexpat-dev gettext
66 + libexpat-dev gettext make
67 ;;
68 Documentation)
69 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
71
72 test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
73 gem install --version 1.5.8 asciidoctor
74 ;;
75 +linux-gcc-4.8|GETTEXT_POISON)
76 + sudo apt-get -q update
77 + sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
78 + ;;
79 esac
80
81 if type p4d >/dev/null && type p4 >/dev/null