From 92b4022a80aa68a9d7bd663b5718b832cef58c91 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 25 Oct 2021 17:10: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 7126e24..c662b4e 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
@@ -182,10 +175,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
@@ -213,9 +203,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} env CTEST_OUTPUT_ON_FAILURE=1 make test
   -         fi
   -     fi
-- 
cgit v1.2.3


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

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

diff --git a/.build.yml b/.build.yml
index c662b4e..b6a64e1 100644
--- a/.build.yml
+++ b/.build.yml
@@ -198,13 +198,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 ./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
-- 
cgit v1.2.3


From 892aaf8e4873c0b2c0402499e46da74d986b2995 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 25 Oct 2021 17:11:08 +0200
Subject: .build.yml: Remove source code of locally built dependency after it
 has been installed.

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

diff --git a/.build.yml b/.build.yml
index b6a64e1..3eb99eb 100644
--- a/.build.yml
+++ b/.build.yml
@@ -168,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
-- 
cgit v1.2.3