diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-05-12 13:07:56 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-05-12 13:07:56 +0200 |
commit | 025c376068f63d8c2aa5899a3c0b1b827370da28 (patch) | |
tree | 99d5ce170fa25fd17f5d4569e8b3b3656c9fe44b /.build.yml | |
parent | aa6723b9cc3dcac5b9bdd87944a8c99b74f16ba2 (diff) | |
parent | c277aa68455b232c37a4c52b39e948a6ab0b0e11 (diff) | |
download | libayatana-indicator-025c376068f63d8c2aa5899a3c0b1b827370da28.tar.gz libayatana-indicator-025c376068f63d8c2aa5899a3c0b1b827370da28.tar.bz2 libayatana-indicator-025c376068f63d8c2aa5899a3c0b1b827370da28.zip |
Merge branch 'tari01-pr/move-to-cmake'
Attributes GH PR #38: https://github.com/AyatanaIndicators/libayatana-indicator/pull/38
Diffstat (limited to '.build.yml')
-rw-r--r-- | .build.yml | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -104,15 +104,15 @@ build_scripts: - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - fi - - - 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 [ -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 + - elif [ -e ./autogen.sh ]; then + - NOCONFIGURE=1 ./autogen.sh + - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - else - exit 1 - fi @@ -135,11 +135,11 @@ after_scripts: - if [ ${BUILD_TYPE} == "scripts" ];then - XVFB_RUN="$(which xvfb-run || true)" - if [ ${DISTRO_NAME} == "debian" ];then - - if [ -e ./autogen.sh ]; then + - if [ -e ./CMakeLists.txt ]; then + - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test + - elif [ -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 |