diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-05 19:36:15 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-05 19:36:15 +0900 |
| commit | a8d2a73c771f188fc0fdc6351b4923af788317d5 (patch) | |
| tree | b2795b93149f7c0ae3cd5005331b650a8eb6fd1e /.travis.yml | |
| parent | da16225dfbec9b155c2c299757203f7676ac6ccf (diff) | |
| parent | a63838235134b066c092ad98e1f18ff7991c91c1 (diff) | |
| download | libquotient-a8d2a73c771f188fc0fdc6351b4923af788317d5.tar.gz libquotient-a8d2a73c771f188fc0fdc6351b4923af788317d5.zip | |
Merge branch 'kitsune-gtad'
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 45db175a..0b2967cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - sourceline: 'ppa:beineri/opt-qt563-trusty' + - sourceline: 'ppa:beineri/opt-qt571-trusty' packages: - g++-5 - - qt56base + - qt57base - valgrind matrix: @@ -22,16 +22,27 @@ matrix: before_install: - eval "${ENV_EVAL}" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt56/bin/qt56-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt57/bin/qt57-env.sh; fi -script: -# Build and install with CMake +install: +- git clone https://github.com/QMatrixClient/matrix-doc.git +- git clone --recursive https://github.com/KitsuneRal/gtad.git +- pushd gtad +- cmake -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} . +- cmake --build . +- popd + +before_script: - mkdir build && pushd build -- cmake -DCMAKE_INSTALL_PREFIX=../install .. -- cmake --build . --target all -- cmake --build . --target install +- cmake -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_PREFIX=../install .. +- cmake --build . --target update-api +- popd + +script: +- cmake --build build --target all +- cmake --build build --target install # Build qmc-example with the installed library -- popd && mkdir build-example && pushd build-example +- mkdir build-example && pushd build-example - cmake -DCMAKE_PREFIX_PATH=../install ../examples - cmake --build . --target all - popd |