From 9ab858c96fe05639e8e9b413c3f4990fa1d4cd93 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 17:12:58 +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 373f948..587f5b6 100644 --- a/.build.yml +++ b/.build.yml @@ -12,8 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - - cmake - intltool - glib2 - systemd @@ -30,7 +28,6 @@ requires: - git - cmake - cmake-extras - - mate-common - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev @@ -41,7 +38,6 @@ requires: debian:stable: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido - - autopoint - clang - clang-tools - g++ @@ -49,7 +45,6 @@ requires: - git - cmake - cmake-extras - - mate-common - libglib2.0-dev - libgtest-dev - systemd @@ -58,14 +53,12 @@ requires: - valac ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev @@ -75,14 +68,12 @@ requires: - valac ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - libglib2.0-dev - libgtest-dev - systemd @@ -114,10 +105,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 -DENABLE_WERROR=ON - else @@ -145,9 +133,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 3e03d9388484d999b5aee07db4c4d47787f58980 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 17:13:18 +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 587f5b6..0186a07 100644 --- a/.build.yml +++ b/.build.yml @@ -128,13 +128,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 e48ea60952100658d479a0154b1b2659d229a956 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 1 Nov 2021 08:34:56 +0100 Subject: .build.yml. Add intltool build-requirement. --- .build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.build.yml b/.build.yml index 0186a07..7638fcb 100644 --- a/.build.yml +++ b/.build.yml @@ -28,6 +28,7 @@ requires: - git - cmake - cmake-extras + - intltool - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev @@ -45,6 +46,7 @@ requires: - git - cmake - cmake-extras + - intltool - libglib2.0-dev - libgtest-dev - systemd @@ -59,6 +61,7 @@ requires: - git - cmake - cmake-extras + - intltool - libglib2.0-dev - liblomiri-url-dispatcher-dev - libgtest-dev @@ -74,6 +77,7 @@ requires: - git - cmake - cmake-extras + - intltool - libglib2.0-dev - libgtest-dev - systemd -- cgit v1.2.3 From 7f5b1897510a151667deb0be93c761762e062030 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 1 Nov 2021 10:07:41 +0100 Subject: .build.yml: Drop explicit build requirements list for debian:stable (omitting lomiri-url-dispatcher). Since Debian 11, lomiri-url-dispatcher has become available. --- .build.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.build.yml b/.build.yml index 7638fcb..33f2150 100644 --- a/.build.yml +++ b/.build.yml @@ -37,23 +37,6 @@ requires: - libgirepository1.0-dev - valac - debian:stable: - # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido - - clang - - clang-tools - - g++ - - cppcheck - - git - - cmake - - cmake-extras - - intltool - - libglib2.0-dev - - libgtest-dev - - systemd - - gobject-introspection - - libgirepository1.0-dev - - valac - ubuntu: - clang - clang-tools -- cgit v1.2.3 From f5373a27e39da98881efd106e81290effcdc28bb Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 22 Oct 2021 00:24:01 +0200 Subject: data/CMakeLists.txt: Do not use automatic GSchema compilation --- data/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 317f39d..b014341 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,7 +4,6 @@ find_package(Intltool REQUIRED) set(ENV{LC_ALL} "C") intltool_merge_translations("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.common.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.common.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS) find_package(GSettings REQUIRED) -set(GSETTINGS_COMPILE ON) add_schema("org.ayatana.common.gschema.xml") # ayatana-indicators.target -- cgit v1.2.3