mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-09 23:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

manually use apt-get to install packages on bionic

Browse Source
This commit is contained in:
andy5995
2019-07-26 23:15:06 -05:00
parent dd0eef6aab
commit dd08b70e46
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
.travis.yml
View File

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