0f0c51181d
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>
57 lines
1.0 KiB
YAML
57 lines
1.0 KiB
YAML
language: c
|
|
|
|
cache:
|
|
directories:
|
|
- $HOME/travis-cache
|
|
|
|
os:
|
|
- linux
|
|
- osx
|
|
|
|
compiler:
|
|
- clang
|
|
- gcc
|
|
|
|
matrix:
|
|
include:
|
|
- env: jobname=GETTEXT_POISON
|
|
os: linux
|
|
compiler:
|
|
addons:
|
|
before_install:
|
|
- env: jobname=Windows
|
|
os: linux
|
|
compiler:
|
|
addons:
|
|
before_install:
|
|
script:
|
|
- >
|
|
test "$TRAVIS_REPO_SLUG" != "git/git" ||
|
|
ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
|
|
after_failure:
|
|
- env: jobname=Linux32
|
|
os: linux
|
|
compiler:
|
|
addons:
|
|
services:
|
|
- docker
|
|
before_install:
|
|
script: ci/run-linux32-docker.sh
|
|
- env: jobname=StaticAnalysis
|
|
os: linux
|
|
compiler:
|
|
script: ci/run-static-analysis.sh
|
|
after_failure:
|
|
- env: jobname=Documentation
|
|
os: linux
|
|
compiler:
|
|
script: ci/test-documentation.sh
|
|
after_failure:
|
|
|
|
before_install: ci/install-dependencies.sh
|
|
script: ci/run-build-and-tests.sh
|
|
after_failure: ci/print-test-failures.sh
|
|
|
|
notifications:
|
|
email: false
|