Backport the master Travis changes to insp20.

This commit is contained in:
Peter Powell 2016-12-02 14:04:30 +00:00
parent 491340999d
commit b68ba97cf9
2 changed files with 8 additions and 12 deletions

View File

@ -1,12 +1,13 @@
compiler:
- "clang"
- "gcc"
language: "cpp"
- clang
- gcc
dist: trusty
env:
- PURE_STATIC=1
-
language: cpp
notifications:
email: false
os:
- "linux"
- "osx"
script:
- "sh ./tools/travis-ci.sh"
- sh ./tools/travis-ci.sh
sudo: required

View File

@ -4,11 +4,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]
then
sudo apt-get update --assume-yes
sudo apt-get install --assume-yes libgeoip-dev libgnutls-dev libldap2-dev libmysqlclient-dev libpcre3-dev libpq-dev libsqlite3-dev libssl-dev libtre-dev
elif [ "$TRAVIS_OS_NAME" = "osx" ]
then
brew update
brew install geoip gnutls mysql-connector-c openssl pcre postgresql sqlite3 tre
brew link sqlite3 --force
else
>&2 echo "'$TRAVIS_OS_NAME' is an unknown Travis CI environment!"
exit 1