diff options
| author | Robert Tari <robert@tari.in> | 2021-10-25 17:21:26 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-25 17:21:26 +0200 |
| commit | d8197520052c91c3a27530583f7dd87934739b78 (patch) | |
| tree | bd1030b2bc7b8b26bc26d1ad2d5cc0373b75e7a1 | |
| parent | 2048cd983ed5626c10dba5b1542f99cf5857399a (diff) | |
| parent | 7929019e77de554047dee4259e48bf807c63ae4d (diff) | |
| download | ayatana-indicator-datetime-d8197520052c91c3a27530583f7dd87934739b78.tar.gz ayatana-indicator-datetime-d8197520052c91c3a27530583f7dd87934739b78.tar.bz2 ayatana-indicator-datetime-d8197520052c91c3a27530583f7dd87934739b78.zip | |
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #61: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/61
| -rw-r--r-- | .build.yml | 31 |
1 files changed, 10 insertions, 21 deletions
@@ -11,7 +11,6 @@ requires: - which - cmake - cmake-extras - - mate-common - dbus - intltool # - libayatana-common @@ -31,7 +30,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido - - autopoint - clang - clang-tools - g++ @@ -39,7 +37,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libaccounts-glib-dev # - libayatana-common-dev @@ -73,7 +70,6 @@ requires: - gcovr ubuntu: - - autopoint - clang - clang-tools - g++ @@ -81,7 +77,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libaccounts-glib-dev # - libayatana-common-dev @@ -114,7 +109,6 @@ requires: - gcovr ubuntu:focal: - - autopoint - clang - clang-tools - g++ @@ -122,7 +116,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libaccounts-glib-dev # - libayatana-common-dev @@ -181,6 +174,9 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-common-build/ + - - cd ${START_DIR} - if [ ! -d ayatana-indicator-messages-build ]; then - git clone --depth 1 https://github.com/AyatanaIndicators/ayatana-indicator-messages.git ayatana-indicator-messages-build @@ -189,6 +185,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf ayatana-indicator-messages-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then @@ -196,10 +194,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 @@ -222,15 +217,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} make test - - fi + - XVFB_RUN="$(which xvfb-run || true)" + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then + - if [ -e ./CMakeLists.txt ]; then + - ${XVFB_RUN} make test - fi - fi |