aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml26
1 files changed, 7 insertions, 19 deletions
diff --git a/.build.yml b/.build.yml
index 7265d2cb..908aa55c 100644
--- a/.build.yml
+++ b/.build.yml
@@ -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