From 430f6637ecebbcbd2500c213f17867e51fa32ac0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 13:03:57 +0200 Subject: .build.yml: Drop autogen.sh support. --- .build.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.build.yml b/.build.yml index d644b23..43d5b85 100644 --- a/.build.yml +++ b/.build.yml @@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - intltool # - libayatana-common - gobject-introspection @@ -23,7 +22,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-notifications - - autopoint - clang - clang-tools - g++ @@ -31,7 +29,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - gobject-introspection @@ -42,14 +39,12 @@ requires: - systemd ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - gobject-introspection @@ -60,14 +55,12 @@ requires: - systemd ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool # - libayatana-common-dev - gobject-introspection @@ -111,10 +104,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" ];then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else @@ -142,9 +132,7 @@ build_scripts: # - if [ ${BUILD_TYPE} == "scripts" ];then # - XVFB_RUN="$(which xvfb-run || true)" # - if [ ${DISTRO_NAME} == "debian" ];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 0177abb3df75f201335a75d47fe4d9de63145d7b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 13:04:17 +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 43d5b85..b90107f 100644 --- a/.build.yml +++ b/.build.yml @@ -127,13 +127,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" ];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" ];then +# - if [ -e ./CMakeLists.txt ]; then +# - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test # - fi # - fi -- cgit v1.2.3 From 6a12835c266fec55d8608da42dca0152700d30ef Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 13:04:52 +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 b90107f..386351c 100644 --- a/.build.yml +++ b/.build.yml @@ -97,6 +97,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