aboutsummaryrefslogtreecommitdiff
path: root/.build.yml
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-10-25 18:00:38 +0200
committerRobert Tari <robert@tari.in>2021-10-25 18:00:38 +0200
commit420a0c16d82e57f61089b4111d5c446a54cdf9ae (patch)
treea446a2f79eb713da66ae90e27e9a9a44eaec0683 /.build.yml
parentf2f735386ee56c0449761e9bd75e367f0050b0f7 (diff)
parent892aaf8e4873c0b2c0402499e46da74d986b2995 (diff)
downloadayatana-indicator-sound-420a0c16d82e57f61089b4111d5c446a54cdf9ae.tar.gz
ayatana-indicator-sound-420a0c16d82e57f61089b4111d5c446a54cdf9ae.tar.bz2
ayatana-indicator-sound-420a0c16d82e57f61089b4111d5c446a54cdf9ae.zip
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #39: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/39
Diffstat (limited to '.build.yml')
-rw-r--r--.build.yml29
1 files changed, 8 insertions, 21 deletions
diff --git a/.build.yml b/.build.yml
index 7126e24..3eb99eb 100644
--- a/.build.yml
+++ b/.build.yml
@@ -12,7 +12,6 @@ requires:
- which
- cmake
- cmake-extras
- - mate-common
- dbus
- accountsservice
- gsettings-desktop-schemas
@@ -33,7 +32,6 @@ requires:
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-sound
- - autopoint
- clang
- clang-tools
- g++
@@ -41,7 +39,6 @@ requires:
- git
- cmake
- cmake-extras
- - mate-common
- dbus
- gir1.2-accountsservice-1.0
- intltool
@@ -72,7 +69,6 @@ requires:
- python3-dbusmock
ubuntu:
- - autopoint
- clang
- clang-tools
- g++
@@ -80,7 +76,6 @@ requires:
- git
- cmake
- cmake-extras
- - mate-common
- dbus
- gir1.2-accountsservice-1.0
- intltool
@@ -111,7 +106,6 @@ requires:
- python3-dbusmock
ubuntu:focal:
- - autopoint
- clang
- clang-tools
- g++
@@ -119,7 +113,6 @@ requires:
- git
- cmake
- cmake-extras
- - mate-common
- dbus
- gir1.2-accountsservice-1.0
- intltool
@@ -175,6 +168,8 @@ before_scripts:
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
- make install
+ - cd -
+ - rm -Rf libayatana-common-build/
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
@@ -182,10 +177,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
@@ -208,15 +200,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