aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-10-25 17:48:06 +0200
committerRobert Tari <robert@tari.in>2021-10-25 17:48:06 +0200
commit9496810bad9bc155b81d6f8ab6d92dc94bab65d5 (patch)
tree3fe6b9b6a81319b5ab46692abd69ab62d5aef18f
parent6f08a78ffd16187047608d1abdbbb1ffd37b4ce4 (diff)
parent50f55568456afaa22e717a84ea09d5ce42671639 (diff)
downloadayatana-indicator-power-9496810bad9bc155b81d6f8ab6d92dc94bab65d5.tar.gz
ayatana-indicator-power-9496810bad9bc155b81d6f8ab6d92dc94bab65d5.tar.bz2
ayatana-indicator-power-9496810bad9bc155b81d6f8ab6d92dc94bab65d5.zip
Merge branch 'sunweaver-pr/travis-ci'
Attributes GH PR #43: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/43
-rw-r--r--.build.yml29
1 files changed, 8 insertions, 21 deletions
diff --git a/.build.yml b/.build.yml
index 46099cd..15d5205 100644
--- a/.build.yml
+++ b/.build.yml
@@ -12,7 +12,6 @@ requires:
- which
- cmake
- cmake-extras
- - mate-common
- intltool
# - libayatana-common
- liblomiri-url-dispatcher
@@ -25,7 +24,6 @@ requires:
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-power
- - autopoint
- clang
- clang-tools
- g++
@@ -33,7 +31,6 @@ requires:
- git
- cmake
- cmake-extras
- - mate-common
- intltool
# - libayatana-common-dev
- liblomiri-url-dispatcher-dev
@@ -50,14 +47,12 @@ requires:
- libgstreamer1.0-dev
ubuntu:
- - autopoint
- clang
- clang-tools
- g++
- git
- cmake
- cmake-extras
- - mate-common
- intltool
# - libayatana-common-dev
- liblomiri-url-dispatcher-dev
@@ -74,14 +69,12 @@ requires:
- libgstreamer1.0-dev
ubuntu:focal:
- - autopoint
- clang
- clang-tools
- g++
- git
- cmake
- cmake-extras
- - mate-common
- intltool
# - libayatana-common-dev
# - liblomiri-url-dispatcher-dev
@@ -124,6 +117,8 @@ before_scripts:
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
- make install
+ - cd -
+ - rm -Rf libayatana-common-build/
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
@@ -131,10 +126,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
@@ -157,15 +149,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