diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-06-04 16:07:47 +0300 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-06-04 16:07:47 +0300 |
| commit | 1366b01790631ba1134a4dfd03d939b4b40360b8 (patch) | |
| tree | 28131edb04a563021bd1a3d445ec3be7c4ae6602 /.ci | |
| parent | Include mtxclient in the build (diff) | |
| download | nheko-1366b01790631ba1134a4dfd03d939b4b40360b8.tar.xz | |
Install missing dependencies in travis-ci/appveyor
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/install.sh | 7 | ||||
| -rwxr-xr-x | .ci/script.sh | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index f81f9265..ee172581 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -4,7 +4,8 @@ set -ex if [ $TRAVIS_OS_NAME == osx ]; then brew update - brew install qt5 lmdb clang-format ninja + brew install qt5 lmdb clang-format ninja libsodium spdlog + brew upgrade boost curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py sudo python get-pip.py @@ -23,6 +24,7 @@ if [ $TRAVIS_OS_NAME == linux ]; then QT_PKG="59" fi + sudo add-apt-repository -y ppa:chris-lea/libsodium sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo apt-get update -qq @@ -32,5 +34,6 @@ if [ $TRAVIS_OS_NAME == linux ]; then qt${QT_PKG}svg \ qt${QT_PKG}multimedia \ cmake \ - liblmdb-dev + liblmdb-dev \ + libsodium-dev fi diff --git a/.ci/script.sh b/.ci/script.sh index a954eba6..f5966349 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -10,7 +10,16 @@ if [ $TRAVIS_OS_NAME == osx ]; then export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 fi -make ci +# Build & install dependencies +mkdir -p .deps/usr/{lib,include}/ +cmake -Hdeps -B.deps \ + -DUSE_BUNDLED_BOOST=${USE_BUNDLED_BOOST} \ + -DUSE_BUNDLED_SPDLOG=${USE_BUNDLED_SPDLOG} +cmake --build .deps + +# Build nheko +cmake -GNinja -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake --build build if [ $TRAVIS_OS_NAME == osx ]; then make lint; |