From fd1d99c04589091b1f6efa5673e79d4e2335873e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 25 Oct 2021 12:15:18 +0200
Subject: .build.yml: Drop autogen.sh support.

---
 .build.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.build.yml b/.build.yml
index bb32613..844dbd4 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
@@ -196,10 +189,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
@@ -227,9 +217,7 @@ 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
+  -         if [ -e ./CMakeLists.txt ]; then
   -             ${XVFB_RUN} make test
   -         fi
   -     fi
-- 
cgit v1.2.3


From 485360d04463a38e29e8d4f3e056f247bdb26de9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 25 Oct 2021 12:15:55 +0200
Subject: .build.yml: Run unit tests in build_scripts: target.

---
 .build.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.build.yml b/.build.yml
index 844dbd4..eae536f 100644
--- a/.build.yml
+++ b/.build.yml
@@ -212,13 +212,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 ./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
-- 
cgit v1.2.3


From 7929019e77de554047dee4259e48bf807c63ae4d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 25 Oct 2021 12:16:55 +0200
Subject: .build.yml: Remove source code of locally built dependencies after
 they have been installed.

---
 .build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.build.yml b/.build.yml
index eae536f..b9d69a5 100644
--- a/.build.yml
+++ b/.build.yml
@@ -174,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
@@ -182,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
-- 
cgit v1.2.3