Add CMake to the CI matrix
This commit is contained in:
parent
d1c06cd3e9
commit
e701bfd596
4 changed files with 23 additions and 1 deletions
|
@ -7,10 +7,12 @@ apt-get install -qq \
|
||||||
build-essential \
|
build-essential \
|
||||||
check \
|
check \
|
||||||
clang \
|
clang \
|
||||||
|
cmake \
|
||||||
graphviz-dev \
|
graphviz-dev \
|
||||||
libjemalloc-dev \
|
libjemalloc-dev \
|
||||||
libpcre3-dev \
|
libpcre3-dev \
|
||||||
libtool \
|
libtool \
|
||||||
|
ninja-build \
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
||||||
if [ x$COVERALLS == xyes ]; then
|
if [ x$COVERALLS == xyes ]; then
|
||||||
|
|
8
.travis-ci/script-cmake.sh
Executable file
8
.travis-ci/script-cmake.sh
Executable file
|
@ -0,0 +1,8 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -ev
|
||||||
|
|
||||||
|
mkdir build && cd build
|
||||||
|
cmake -GNinja ..
|
||||||
|
ninja -v
|
||||||
|
ctest
|
14
.travis.yml
14
.travis.yml
|
@ -11,6 +11,7 @@ matrix:
|
||||||
include:
|
include:
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
env:
|
env:
|
||||||
|
- TYPE=autotools
|
||||||
- CONFIGURE_OPTION='--enable-debug --enable-gcov --with-malloc=jemalloc'
|
- CONFIGURE_OPTION='--enable-debug --enable-gcov --with-malloc=jemalloc'
|
||||||
- COVERALLS=yes
|
- COVERALLS=yes
|
||||||
- VALGRIND=no
|
- VALGRIND=no
|
||||||
|
@ -19,6 +20,7 @@ matrix:
|
||||||
- CXX=g++
|
- CXX=g++
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
env:
|
env:
|
||||||
|
- TYPE=autotools
|
||||||
- CONFIGURE_OPTION='--enable-debug --enable-gcov'
|
- CONFIGURE_OPTION='--enable-debug --enable-gcov'
|
||||||
- COVERALLS=yes
|
- COVERALLS=yes
|
||||||
- VALGRIND=yes
|
- VALGRIND=yes
|
||||||
|
@ -27,12 +29,22 @@ matrix:
|
||||||
- CXX=g++
|
- CXX=g++
|
||||||
- compiler: clang
|
- compiler: clang
|
||||||
env:
|
env:
|
||||||
|
- TYPE=autotools
|
||||||
- CONFIGURE_OPTION='--enable-debug --enable-gcov'
|
- CONFIGURE_OPTION='--enable-debug --enable-gcov'
|
||||||
- COVERALLS=yes
|
- COVERALLS=yes
|
||||||
- VALGRIND=yes
|
- VALGRIND=yes
|
||||||
- DEBUG=yes
|
- DEBUG=yes
|
||||||
- CC=clang
|
- CC=clang
|
||||||
- CXX=clang++
|
- CXX=clang++
|
||||||
|
- compiler: gcc
|
||||||
|
env:
|
||||||
|
- TYPE=cmake
|
||||||
|
- CONFIGURE_OPTION='--enable-debug --enable-gcov'
|
||||||
|
- COVERALLS=yes
|
||||||
|
- VALGRIND=yes
|
||||||
|
- DEBUG=yes
|
||||||
|
- CC=gcc
|
||||||
|
- CXX=g++
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- docker run -d
|
- docker run -d
|
||||||
|
@ -52,7 +64,7 @@ install:
|
||||||
- docker exec -t build bash -c "cd /travis && .travis-ci/install.sh"
|
- docker exec -t build bash -c "cd /travis && .travis-ci/install.sh"
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- docker exec -t build bash -c "cd /travis && .travis-ci/script.sh"
|
- docker exec -t build bash -c "cd /travis && .travis-ci/script-$TYPE.sh"
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- docker exec -t build bash -c "cd /travis && .travis-ci/after_success.sh"
|
- docker exec -t build bash -c "cd /travis && .travis-ci/after_success.sh"
|
||||||
|
|
Loading…
Reference in a new issue