summaryrefslogtreecommitdiff
path: root/tools/travis-ci.sh
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2016-09-13 02:56:14 +0100
committerPeter Powell <petpow@saberuk.com>2016-09-15 02:21:53 +0100
commitfb029add367bde0b8cb7b719034a39429e59c64c (patch)
treefe444e6fe35831e7423576f826121846db26f82d /tools/travis-ci.sh
parent42888e2907dacb829e2a29effbee83efb5bef6ec (diff)
Speed up Travis builds.
- Switch Linux builds to Ubuntu 14.04 from 12.04. - Split dynamic and static builds into different jobs. - Remove OS X builds as the infrastructure is slow and unreliable.
Diffstat (limited to 'tools/travis-ci.sh')
-rwxr-xr-xtools/travis-ci.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh
index 521d91e38..bb32e19a1 100755
--- a/tools/travis-ci.sh
+++ b/tools/travis-ci.sh
@@ -1,18 +1,12 @@
#!/bin/bash
-set -v
+set -ev
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
fi
-set -e
export TEST_BUILD_MODULES="m_geoip.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_openssl.cpp"
./tools/test-build $CXX