From e7872e7dbf28f7c15ea6b9281dc5e2c7fda16dec Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:53:48 +0200 Subject: .build.yml: Drop autogen.sh support. --- .build.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index d1a101b..d9b5644 100644 --- a/.build.yml +++ b/.build.yml @@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - dbus - intltool - glib2 @@ -24,7 +23,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-display - - autopoint - clang - clang-tools - g++ @@ -32,7 +30,6 @@ requires: - git - cmake - cmake-extras - - mate-common - dbus - intltool # - libayatana-common-dev @@ -54,14 +51,12 @@ requires: - systemd ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - dbus - intltool # - libayatana-common-dev @@ -84,14 +79,12 @@ requires: - gsettings-ubuntu-schemas ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - dbus - intltool # - libayatana-common-dev @@ -147,10 +140,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 @@ -178,9 +168,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 f670d1cda5bf960e1e1e50d37f640474cd2b7631 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:54:27 +0200 Subject: .build.yml: Run unit tests in build_scripts: target. --- .build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index d9b5644..527efa8 100644 --- a/.build.yml +++ b/.build.yml @@ -163,13 +163,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 From 313410a372dc87943bd1b5045ab29bd4a00daf9d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:55:05 +0200 Subject: .build.yml: Remove source code of locally built dependency after it has been installed. --- .build.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index 527efa8..47d88bf 100644 --- a/.build.yml +++ b/.build.yml @@ -133,6 +133,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