diff options
| author | Peter Powell <petpow@saberuk.com> | 2016-12-02 14:04:30 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2016-12-02 14:04:47 +0000 |
| commit | b68ba97cf97ffd5aa06a7dd86ad86c71e852413d (patch) | |
| tree | 8c7e9d536229d6bd8dd701aed2eb9ff37d695d05 | |
| parent | 491340999d4e8eefa99f15259fadc2af914dd733 (diff) | |
Backport the master Travis changes to insp20.
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rwxr-xr-x | tools/travis-ci.sh | 5 |
2 files changed, 8 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 631802526..bb82add9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index 6dbc82300..42b07fa25 100755 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -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 |