summaryrefslogtreecommitdiff
path: root/ci/install-dependencies.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2018-11-01 12:47:14 +0100
committerJunio C Hamano <gitster@pobox.com>2018-11-02 11:28:19 +0900
commit0f0c51181dfb8ca0045ef94715f147f780bc63dd (patch)
treec1f881b8b617a6119cc1c0b06007261daf13c794 /ci/install-dependencies.sh
parent32ee384be83bee900af272f2df3c12814e1b8ed6 (diff)
downloadgit-0f0c51181dfb8ca0045ef94715f147f780bc63dd.tar.gz
travis-ci: install packages in 'ci/install-dependencies.sh'
Ever since we started using Travis CI, we specified the list of packages to install in '.travis.yml' via the APT addon. While running our builds on Travis CI's container-based infrastructure we didn't have another choice, because that environment didn't support 'sudo', and thus we didn't have permission to install packages ourselves. With the switch to the VM-based infrastructure in the previous patch we do get a working 'sudo', so we can install packages by running 'sudo apt-get -y install ...' as well. Let's make use of this and install necessary packages in 'ci/install-dependencies.sh', so all the dependencies (i.e. both packages and "non-packages" (P4 and Git-LFS)) are handled in the same file. Install gcc-8 only in the 'linux-gcc' build job; so far it has been unnecessarily installed in the 'linux-clang' build job as well. Print the versions of P4 and Git-LFS conditionally, i.e. only when they have been installed; with this change even the static analysis and documentation build jobs start using 'ci/install-dependencies.sh' to install packages, and neither of these two build jobs depend on and thus install those. This change will presumably be beneficial for the upcoming Azure Pipelines integration [1]: preliminary versions of that patch series run a couple of 'apt-get' commands to install the necessary packages before running 'ci/install-dependencies.sh', but with this patch it will be sufficient to run only 'ci/install-dependencies.sh'. [1] https://public-inbox.org/git/1a22efe849d6da79f2c639c62a1483361a130238.1539598316.git.gitgitgadget@gmail.com/ Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci/install-dependencies.sh')
-rwxr-xr-xci/install-dependencies.sh35
1 files changed, 29 insertions, 6 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 75a9fd2475..06c3546e1e 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -10,6 +10,15 @@ LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VE
case "$jobname" in
linux-clang|linux-gcc)
+ sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+ sudo apt-get -q update
+ sudo apt-get -q -y install language-pack-is git-svn apache2
+ case "$jobname" in
+ linux-gcc)
+ sudo apt-get -q -y install gcc-8
+ ;;
+ esac
+
mkdir --parents "$P4_PATH"
pushd "$P4_PATH"
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@ -32,11 +41,25 @@ osx-clang|osx-gcc)
brew link --force gettext
brew install caskroom/cask/perforce
;;
+StaticAnalysis)
+ sudo apt-get -q update
+ sudo apt-get -q -y install coccinelle
+ ;;
+Documentation)
+ sudo apt-get -q update
+ sudo apt-get -q -y install asciidoc xmlto
+ ;;
esac
-echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
-p4d -V | grep Rev.
-echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
-p4 -V | grep Rev.
-echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
-git-lfs version
+if type p4d >/dev/null && type p4 >/dev/null
+then
+ echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
+ p4d -V | grep Rev.
+ echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
+ p4 -V | grep Rev.
+fi
+if type git-lfs >/dev/null
+then
+ echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
+ git-lfs version
+fi