diff options
author | Robert Tari <robert@tari.in> | 2021-10-25 17:41:26 +0200 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2021-10-25 17:41:26 +0200 |
commit | dc23d05a2083a983a65c72bd8986e8e386066889 (patch) | |
tree | 9fad9e1acb4169c43d804959d8df9b5d66e7d9c2 | |
parent | 230fc5256ec811703910f51c1506fc5c369287c9 (diff) | |
parent | 6a12835c266fec55d8608da42dca0152700d30ef (diff) | |
download | ayatana-indicator-notifications-dc23d05a2083a983a65c72bd8986e8e386066889.tar.gz ayatana-indicator-notifications-dc23d05a2083a983a65c72bd8986e8e386066889.tar.bz2 ayatana-indicator-notifications-dc23d05a2083a983a65c72bd8986e8e386066889.zip |
Merge branch 'sunweaver-pr/travis-ci'
Attributes GH PR #23: https://github.com/AyatanaIndicators/ayatana-indicator-notifications/pull/23
-rw-r--r-- | .build.yml | 28 |
1 files changed, 7 insertions, 21 deletions
@@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - intltool # - libayatana-common - gobject-introspection @@ -23,7 +22,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-notifications - - autopoint - clang - clang-tools - g++ @@ -31,7 +29,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - gobject-introspection @@ -42,14 +39,12 @@ requires: - systemd ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - gobject-introspection @@ -60,14 +55,12 @@ requires: - systemd ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - gobject-introspection @@ -104,6 +97,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-common-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then @@ -111,10 +106,7 @@ 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 @@ -137,15 +129,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" ];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" ];then +# - if [ -e ./CMakeLists.txt ]; then +# - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test # - fi # - fi |