diff options
| author | Robert Tari <robert@tari.in> | 2021-11-01 10:52:50 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-11-01 10:52:50 +0100 |
| commit | 7c08c8abbe4dc980b91ff4641292ea2b841e8757 (patch) | |
| tree | c206a018d76c65bdc7c707917640d63146b15ea6 | |
| parent | 90856e165eff9b49bbd24c8ca627b777da411519 (diff) | |
| parent | f5373a27e39da98881efd106e81290effcdc28bb (diff) | |
| download | libayatana-common-7c08c8abbe4dc980b91ff4641292ea2b841e8757.tar.gz libayatana-common-7c08c8abbe4dc980b91ff4641292ea2b841e8757.tar.bz2 libayatana-common-7c08c8abbe4dc980b91ff4641292ea2b841e8757.zip | |
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #49: https://github.com/AyatanaIndicators/libayatana-common/pull/49
| -rw-r--r-- | .build.yml | 48 |
1 files changed, 9 insertions, 39 deletions
@@ -12,8 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - - cmake - intltool - glib2 - systemd @@ -30,7 +28,7 @@ requires: - git - cmake - cmake-extras - - mate-common + - intltool - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev @@ -39,33 +37,14 @@ requires: - libgirepository1.0-dev - valac - debian:stable: - # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido - - autopoint - - clang - - clang-tools - - g++ - - cppcheck - - git - - cmake - - cmake-extras - - mate-common - - libglib2.0-dev - - libgtest-dev - - systemd - - gobject-introspection - - libgirepository1.0-dev - - valac - ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common + - intltool - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev @@ -75,14 +54,13 @@ requires: - valac ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common + - intltool - libglib2.0-dev - libgtest-dev - systemd @@ -114,10 +92,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 -DENABLE_WERROR=ON - else @@ -140,15 +115,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 |