diff options
| author | Robert Tari <robert@tari.in> | 2021-10-25 19:26:45 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-25 19:26:45 +0200 |
| commit | bc77d667b0fef5c370c149fb0b1794a673c54791 (patch) | |
| tree | 2d12d93431343e4766d5c8fc197bc1bf7c4a2715 | |
| parent | bc2bd700f5da40ed2523a57263de303cc52e4b8a (diff) | |
| parent | dab97205da02ff0d3e026c581f2781adc758dfaa (diff) | |
| download | ayatana-indicator-keyboard-bc77d667b0fef5c370c149fb0b1794a673c54791.tar.gz ayatana-indicator-keyboard-bc77d667b0fef5c370c149fb0b1794a673c54791.tar.bz2 ayatana-indicator-keyboard-bc77d667b0fef5c370c149fb0b1794a673c54791.zip | |
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #23: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/23
| -rw-r--r-- | .build.yml | 26 |
1 files changed, 7 insertions, 19 deletions
@@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - intltool - glib2 - libx11 @@ -21,7 +20,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido - - autopoint - clang - clang-tools - g++ @@ -29,7 +27,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - libx11-dev @@ -38,14 +35,12 @@ requires: # - libayatana-common-dev ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - libx11-dev @@ -80,6 +75,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-common-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then @@ -87,10 +84,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 @@ -113,15 +107,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 |