aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml31
1 files changed, 10 insertions, 21 deletions
diff --git a/.build.yml b/.build.yml
index bb32613..b9d69a5 100644
--- a/.build.yml
+++ b/.build.yml
@@ -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