Backport the master Travis changes to insp20.

diff --git a/.travis.yml b/.travis.yml
index 6318025264161fb6087d974fd0b5b75a49a4587f..bb82add9b681014f029101c3e75a69201a3d26d2 100644 (file)
--- 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 6dbc823008449e4581d91818804ff2d2027b68f4..42b07fa251a37003384dba0059896d76bee3a8aa 100755 (executable)
--- 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