From 37e12bc92a8561b1fa89104e5e57c64f0270a097 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 17:07:03 +0200 Subject: .build.yml: Drop autogen.sh support. --- .build.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.build.yml b/.build.yml index 09b01c9..e6cb0d1 100644 --- a/.build.yml +++ b/.build.yml @@ -12,8 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - - cmake - intltool # - libayatana-common - liblomiri-url-dispatcher @@ -24,7 +22,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-session - - autopoint - clang - clang-tools - g++ @@ -32,7 +29,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - liblomiri-url-dispatcher-dev @@ -44,14 +40,12 @@ requires: - dbus ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - liblomiri-url-dispatcher-dev @@ -63,14 +57,12 @@ requires: - dbus ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev # - liblomiri-url-dispatcher-dev @@ -115,10 +107,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 @@ -146,9 +135,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 f7e6c7baa4cecdc6afeab43355dd87b54fd27855 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 17:08:10 +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 e6cb0d1..be44f4c 100644 --- a/.build.yml +++ b/.build.yml @@ -130,13 +130,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 50eab4896d15db5c454b31a24f5fb62a0a8e44aa Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 17:08:34 +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 be44f4c..73d0684 100644 --- a/.build.yml +++ b/.build.yml @@ -100,6 +100,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