Move travis to use a new version of Ubuntu

This commit is contained in:
nikolas 2019-10-31 09:55:09 -03:00 committed by Felipe Zimmerle
parent 71de3b48f2
commit 82980ab392
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 7 additions and 3 deletions

View File

@ -1,4 +1,4 @@
dist: trusty dist: bionic
sudo: true sudo: true
addons: addons:
@ -9,7 +9,6 @@ addons:
- libgeoip-dev - libgeoip-dev
- liblua5.2-dev - liblua5.2-dev
- liblmdb-dev - liblmdb-dev
- cppcheck
language: cpp language: cpp
@ -38,9 +37,12 @@ before_script:
- '[ "$TRAVIS_OS_NAME" != osx ] || brew install libmaxminddb' - '[ "$TRAVIS_OS_NAME" != osx ] || brew install libmaxminddb'
- '[ "$TRAVIS_OS_NAME" != osx ] || brew install lmdb' - '[ "$TRAVIS_OS_NAME" != osx ] || brew install lmdb'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo add-apt-repository --yes ppa:maxmind/ppa' - '[ "$TRAVIS_OS_NAME" != linux ] || sudo add-apt-repository --yes ppa:maxmind/ppa'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo add-apt-repository --yes ppa:grochefort/cppcheck'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get update' - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get update'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-cache search maxmind' - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-cache search maxmind'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get install -y libmaxminddb-dev' - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get install -y libmaxminddb-dev'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get install -y cppcheck'
- '[ "$TRAVIS_OS_NAME" != linux ] || cppcheck --version'
script: script:
- ./build.sh - ./build.sh

View File

@ -64,7 +64,9 @@ cppcheck:
--template="warning: {file},{line},{severity},{id},{message}" \ --template="warning: {file},{line},{severity},{id},{message}" \
-I headers -I . -I others -I src -I others/mbedtls -I src/parser \ -I headers -I . -I others -I src -I others/mbedtls -I src/parser \
--error-exitcode=1 \ --error-exitcode=1 \
-i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \ -i "src/parser/seclang-parser.cc" \
-i "src/parser/seclang-scanner.cc" \
-i "parser/driver.cc" \
--force --verbose . --force --verbose .