aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-05-06 14:04:47 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-05-06 14:05:17 +0200
commitbc6886f1c9021f167fc44a8f125059a8416e9b84 (patch)
tree99a28d818649b24b90d39056832d568742d5d23f
parentf2b0b013de253f5eddeacbae718f0b8e19fcc8f7 (diff)
downloadlibayatana-indicator-bc6886f1c9021f167fc44a8f125059a8416e9b84.tar.gz
libayatana-indicator-bc6886f1c9021f167fc44a8f125059a8416e9b84.tar.bz2
libayatana-indicator-bc6886f1c9021f167fc44a8f125059a8416e9b84.zip
Travis CI: Also support CMake based CI builds.
-rw-r--r--.build.yml26
1 files changed, 21 insertions, 5 deletions
diff --git a/.build.yml b/.build.yml
index b1ed56d..261f72e 100644
--- a/.build.yml
+++ b/.build.yml
@@ -103,9 +103,20 @@ build_scripts:
- export CFLAGS+=" -Wsign-compare -Wunused-parameter"
- cppcheck --enable=warning,style,performance,portability,information,missingInclude .
- fi
-
- - NOCONFIGURE=1 ./autogen.sh
- - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum --enable-tests
+ -
+ - if [ -e ./autogen.sh ]; then
+ - NOCONFIGURE=1 ./autogen.sh
+ - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
+ - elif [ -e ./CMakeLists.txt ]; then
+ - if [ ${DISTRO_NAME} == "debian" ];then
+ - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON
+ - else
+ - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
+ - fi
+ - else
+ - exit 1
+ - fi
+ -
- if [ $CPU_COUNT -gt 1 ]; then
- if [ ${DISTRO_NAME} == "debian" ];then
- scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT
@@ -122,8 +133,13 @@ build_scripts:
after_scripts:
- if [ ${BUILD_TYPE} == "scripts" ];then
+ - XVFB_RUN="$(which xvfb-run || true)"
- if [ ${DISTRO_NAME} == "debian" ];then
- - make check
- - cat tests/test-suite.log
+ - if [ -e ./autogen.sh ]; then
+ - ${XVFB_RUN} make check
+ - cat tests/test-suite.log
+ - elif [ -e ./CMakeLists.txt ]; then
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+ - fi
- fi
- fi