X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftravis-ci.sh;h=176cd33752735c358a633ff01a950398c4bcb206;hb=20fa9e1038ee3d5c2d0c89bf7e8e6dcda0644aa6;hp=6fb6f22ca0058d9d650ca01753790a489c30f7d7;hpb=b198b696c8c713949ede6a900646482112e5daf4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh
index 6fb6f22ca..176cd3375 100755
--- a/tools/travis-ci.sh
+++ b/tools/travis-ci.sh
@@ -1,19 +1,6 @@
 #!/bin/bash
-set -v
-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
-else
-	>&2 echo "'$TRAVIS_OS_NAME' is an unknown Travis CI environment!"
-	exit 1
-fi
-set -e
-./configure --enable-extras=m_geoip.cpp,m_ldapauth.cpp,m_ldapoper.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
-./configure --with-cc=$CXX
-make -j4 install
-./run/bin/inspircd --version
+set -ev
+sudo apt-get update --assume-yes
+sudo apt-get install --assume-yes --no-install-recommends libgnutls-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev
+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