diff options
| author | Robert Tari <robert@tari.in> | 2021-10-25 17:33:03 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-25 17:33:03 +0200 |
| commit | e30bc00850b743465480e78b9e44ffde85f25412 (patch) | |
| tree | fe40b961435503d621c15f58397fcdda77aae6af | |
| parent | c6ce1b057204c009a1d190c3ad6dd7446c718ff7 (diff) | |
| parent | 50eab4896d15db5c454b31a24f5fb62a0a8e44aa (diff) | |
| download | ayatana-indicator-session-e30bc00850b743465480e78b9e44ffde85f25412.tar.gz ayatana-indicator-session-e30bc00850b743465480e78b9e44ffde85f25412.tar.bz2 ayatana-indicator-session-e30bc00850b743465480e78b9e44ffde85f25412.zip | |
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #60: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/60
| -rw-r--r-- | .build.yml | 30 |
1 files changed, 8 insertions, 22 deletions
@@ -12,8 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - - cmake - intltool # - libayatana-common - liblomiri-url-dispatcher @@ -24,7 +22,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-session - - autopoint - clang - clang-tools - g++ @@ -32,7 +29,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - liblomiri-url-dispatcher-dev @@ -44,14 +40,12 @@ requires: - dbus ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - liblomiri-url-dispatcher-dev @@ -63,14 +57,12 @@ requires: - dbus ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev # - liblomiri-url-dispatcher-dev @@ -108,6 +100,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-common-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then @@ -115,10 +109,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" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else @@ -141,15 +132,10 @@ 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 |