From 66ffadb087984e2d71f7ce2f0db1d97a80c116dc Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 18 Sep 2017 03:38:16 +0200 Subject: [PATCH] Improved travis compilation Including pending sql and enabling tools, core-debug, extra-logs and perftools --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58e985bd6..5b061076f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ git: depth: 1 before_install: - - sudo apt-get -y install build-essential libtool make cmake cmake-data openssl + - sudo apt-get -y install build-essential libtool make cmake cmake-data openssl libgoogle-perftools-dev - sudo apt-get -y install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev - git config user.email "travis@build.bot" && git config user.name "Travis CI" - git tag -a -m "Travis build" init @@ -19,7 +19,7 @@ install: - mysql -uroot -e 'create database test_mysql;' # bin directory already exists in the repo and therefore is not created here - cd bin - - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=0 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=check_install + - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DWITH_PERFTOOLS=1 -DENABLE_EXTRA_LOGS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=check_install - cd .. script: @@ -31,6 +31,9 @@ script: - cat data/sql/updates/db_auth/*.sql | mysql -uacore -pacore auth - cat data/sql/updates/db_characters/*.sql | mysql -uacore -pacore characters - cat data/sql/updates/db_world/*.sql | mysql -uacore -pacore world + - cat data/sql/updates/pending_db_auth/*.sql | mysql -uacore -pacore auth + - cat data/sql/updates/pending_db_characters/*.sql | mysql -uacore -pacore characters + - cat data/sql/updates/pending_db_world/*.sql | mysql -uacore -pacore world - mysql -uroot < data/sql/create/drop_mysql.sql - cd bin - make -j 8 -k && make install