Browse Source

manually use apt-get to install packages on bionic

tags/json-c-0.14-20200419
andy5995 6 years ago
parent
commit
dd08b70e46
No known key found for this signature in database GPG Key ID: 6BFEC9B82603CAF
1 changed files with 14 additions and 27 deletions
  1. +14
    -27
      .travis.yml

+ 14
- 27
.travis.yml View File

@@ -24,12 +24,6 @@ matrix:
- os: linux
dist: bionic
compiler: gcc
addons:
apt:
packages:
- valgrind
- cppcheck
- doxygen
env: CHECK="true"
- os: linux
dist: bionic
@@ -38,44 +32,32 @@ matrix:
# clang
# xenial
# The default clang on xenial is clang 7.0
- os: linux
dist: xenial
compiler: clang
addons:
apt:
sources:
- llvm-toolchain-xenial-5.0
packages:
- clang-6.0
- cppcheck
- doxygen
env: CHECK="true"
# bionic
- clang-5.0
env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
- os: linux
dist: bionic
dist:
compiler: clang
addons:
apt:
sources:
- llvm-toolchain-bionic-5.0
- llvm-toolchain-xenial-6.0
packages:
- clang-5.0
env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
- os: linux
dist: bionic
compiler: clang
- clang-6.0
env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
# bionic
# The default clang on bionic is clang 7.0
- os: linux
dist: bionic
compiler: clang
addons:
apt:
packages:
- clang-6.0
- cppcheck
- doxygen
env: CHECK="true"
# osx
- os: osx
@@ -108,9 +90,14 @@ before_script:
script:
- make
# when using bionic, Travis seems to ignore the "addons" section, so installing the packages with apt-get...
- if [ -n "$CHECK" ]; then
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew install doxygen;
else
if [ "$TRAVIS_DIST" = "bionic" ]; then
sudo apt-get install -y valgrind cppcheck doxygen;
fi;
fi;
make distcheck;
if type cppcheck &> /dev/null ; then cppcheck --error-exitcode=1 --quiet *.h *.c tests/ ; fi;


Loading…
Cancel
Save