summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2019-04-16 10:01:37 +0100
committerPeter Powell <petpow@saberuk.com>2019-04-16 10:58:48 +0100
commit925429ed511bc05ac5b7b02000e836bcf9ca00ab (patch)
tree223942a10c6e0df23a8f9343d1950e66924dbdf9
parent14e1d1f844c89e14cac24799c80af47ed6767cf2 (diff)
Upgrade Travis CI system to Xenial.
-rw-r--r--.travis.yml2
-rwxr-xr-xtools/travis-ci.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 204c5c086..e887d02a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
compiler:
- clang
- gcc
-dist: trusty
+dist: xenial
language: cpp
notifications:
email: false
diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh
index 8069717f0..ad5d98e4e 100755
--- a/tools/travis-ci.sh
+++ b/tools/travis-ci.sh
@@ -3,10 +3,10 @@ set -ev
if [ "$TRAVIS_OS_NAME" = "linux" ]
then
sudo apt-get update --assume-yes
- sudo apt-get install --assume-yes libgnutls-dev libldap2-dev libmaxminddb-dev libmysqlclient-dev libpcre3-dev libpq-dev libsqlite3-dev libssl-dev libtre-dev
+ sudo apt-get install --assume-yes libgnutls-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev
else
>&2 echo "'$TRAVIS_OS_NAME' is an unknown Travis CI environment!"
exit 1
fi
-export TEST_BUILD_MODULES="m_geo_maxmind.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"
+export TEST_BUILD_MODULES="m_geo_maxmind.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_re2.cpp,m_regex_stdlib.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_mbedtls.cpp,m_ssl_openssl.cpp,m_sslrehashsignal.cpp"
./tools/test-build $CXX