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

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

diff --git a/.build.yml b/.build.yml
index 5bf55a8..5f840bd 100644
--- a/.build.yml
+++ b/.build.yml
@@ -12,7 +12,6 @@ requires:
     - which
     - cmake
     - cmake-extras
-    - mate-common
     - libayatana-indicator
     - gobject-introspection
     - gtk-doc
@@ -22,7 +21,6 @@ requires:
 
   debian:
     # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-messages
-    - autopoint
     - clang
     - clang-tools
     - g++
@@ -30,7 +28,6 @@ requires:
     - git
     - cmake
     - cmake-extras
-    - mate-common
     - gobject-introspection
     - gtk-doc-tools
     - intltool
@@ -43,14 +40,12 @@ requires:
     - python3-dbusmock
 
   ubuntu:
-    - autopoint
     - clang
     - clang-tools
     - g++
     - git
     - cmake
     - cmake-extras
-    - mate-common
     - gobject-introspection
     - gtk-doc-tools
     - intltool
@@ -98,14 +93,7 @@ build_scripts:
   -     cppcheck --enable=warning,style,performance,portability,information,missingInclude .
   - fi
   -
-  - if [ -e ./autogen.sh ]; then
-  -     NOCONFIGURE=1 ./autogen.sh
-  -     if [ ${DISTRO_NAME} == "debian" ];then
-  -         scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
-  -     else
-  -         scan-build $CHECKERS ./configure --prefix=/usr --disable-tests --enable-gtk-doc --enable-compile-warnings=maximum
-  -     fi
-  - 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
@@ -133,9 +121,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 2ac31d4a774aef3fe60199c49ba4ae7e1fc84da5 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 25 Oct 2021 13:00:56 +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 5f840bd..faac85a 100644
--- a/.build.yml
+++ b/.build.yml
@@ -116,13 +116,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} 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