diff options
| author | Robert Tari <robert@tari.in> | 2021-10-25 19:30:51 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-25 19:30:51 +0200 |
| commit | 8f8d0ccc6c4e72f5e483f407d3379f5119287eab (patch) | |
| tree | 4f2a513beaaf4bc57cb68ef782f318d3017072f9 | |
| parent | 158ff4f564b9679fdccc3076a929bced452e589b (diff) | |
| parent | 2ac31d4a774aef3fe60199c49ba4ae7e1fc84da5 (diff) | |
| download | ayatana-indicator-messages-8f8d0ccc6c4e72f5e483f407d3379f5119287eab.tar.gz ayatana-indicator-messages-8f8d0ccc6c4e72f5e483f407d3379f5119287eab.tar.bz2 ayatana-indicator-messages-8f8d0ccc6c4e72f5e483f407d3379f5119287eab.zip | |
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #23: https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/23
| -rw-r--r-- | .build.yml | 28 |
1 files changed, 5 insertions, 23 deletions
@@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - libayatana-indicator - gobject-introspection - gtk-doc @@ -22,7 +21,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-messages - - autopoint - clang - clang-tools - g++ @@ -30,7 +28,6 @@ requires: - git - cmake - cmake-extras - - mate-common - gobject-introspection - gtk-doc-tools - intltool @@ -43,14 +40,12 @@ requires: - python3-dbusmock ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - gobject-introspection - gtk-doc-tools - intltool @@ -98,14 +93,7 @@ build_scripts: - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - fi - - - if [ -e ./autogen.sh ]; then - - NOCONFIGURE=1 ./autogen.sh - - if [ ${DISTRO_NAME} == "debian" ];then - - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - - else - - scan-build $CHECKERS ./configure --prefix=/usr --disable-tests --enable-gtk-doc --enable-compile-warnings=maximum - - fi - - elif [ -e ./CMakeLists.txt ]; then + - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else @@ -128,15 +116,9 @@ build_scripts: - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi - -after_scripts: - - if [ ${BUILD_TYPE} == "scripts" ];then - - XVFB_RUN="$(which xvfb-run || true)" - - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then - - if [ -e ./autogen.sh ]; then - - ${XVFB_RUN} make check - - elif [ -e ./CMakeLists.txt ]; then - - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - - fi + - XVFB_RUN="$(which xvfb-run || true)" + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then + - if [ -e ./CMakeLists.txt ]; then + - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - fi - fi |