diff options
| author | Robert Tari <robert@tari.in> | 2021-10-26 18:33:23 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-26 18:33:23 +0200 |
| commit | f0c22a8126908741d175499f36b4207b5fa1a48b (patch) | |
| tree | 6e28e9f626d2494b72085a565f6bab80c9dfac61 | |
| parent | 8be805d52a520e73103409c081733ca100f16192 (diff) | |
| parent | 0472b402e33ae5737f63c3e983c7a69f7f2277f3 (diff) | |
| download | ayatana-indicator-bluetooth-f0c22a8126908741d175499f36b4207b5fa1a48b.tar.gz ayatana-indicator-bluetooth-f0c22a8126908741d175499f36b4207b5fa1a48b.tar.bz2 ayatana-indicator-bluetooth-f0c22a8126908741d175499f36b4207b5fa1a48b.zip | |
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #32: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/pull/32
| -rw-r--r-- | .build.yml | 38 |
1 files changed, 13 insertions, 25 deletions
@@ -23,7 +23,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-bluetooth - - autopoint - clang - clang-tools - g++ @@ -31,7 +30,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - systemd @@ -42,14 +40,12 @@ requires: - liblomiri-url-dispatcher-dev ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - systemd @@ -60,14 +56,12 @@ requires: - liblomiri-url-dispatcher-dev ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - systemd @@ -103,17 +97,17 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-common-build/ build_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - - 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 +# No C/C++ code in this project (only Vala). So skip cppcheck run. +# - if [ ${DISTRO_NAME} == "debian" ];then +# - export CFLAGS+=" -Wsign-compare -Wunused-parameter" +# - cppcheck --enable=warning,style,performance,portability,information,missingInclude . +# - fi +# - + - 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 @@ -136,15 +130,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 |