From a3c1ba489253888415e16b1e0b219e17d2251842 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:57:48 +0200 Subject: .build.yml: Drop autogen.sh support. --- .build.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.build.yml b/.build.yml index 7265d2cb..e0cd954e 100644 --- a/.build.yml +++ b/.build.yml @@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - intltool - glib2 - libx11 @@ -21,7 +20,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido - - autopoint - clang - clang-tools - g++ @@ -29,7 +27,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - libx11-dev @@ -38,14 +35,12 @@ requires: # - libayatana-common-dev ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - libx11-dev @@ -87,10 +82,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 @@ -118,9 +110,7 @@ build_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} make test # - fi # - fi -- cgit v1.2.3 From 984124393cd6c6761d07e46c196163af17379aca Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:58:15 +0200 Subject: .build.yml: If we ever start having unit tests, run those 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 e0cd954e..6c201f4a 100644 --- a/.build.yml +++ b/.build.yml @@ -105,13 +105,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} make test -# - fi +# - XVFB_RUN="$(which xvfb-run || true)" +# - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then +# - if [ -e ./CMakeLists.txt ]; then +# - ${XVFB_RUN} make test # - fi # - fi -- cgit v1.2.3 From dab97205da02ff0d3e026c581f2781adc758dfaa Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:58:39 +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 6c201f4a..908aa55c 100644 --- a/.build.yml +++ b/.build.yml @@ -75,6 +75,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