aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-26 10:10:13 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-26 10:10:13 +0200
commit9205e10eedd5dec01aae6f0ca968ab3d6ecff9bd (patch)
tree85da040de072e15c442e92ccc02f78fcb2b080e9
parente128c176615e7b77511ff632f96c208033b63b86 (diff)
downloadayatana-ido-9205e10eedd5dec01aae6f0ca968ab3d6ecff9bd.tar.gz
ayatana-ido-9205e10eedd5dec01aae6f0ca968ab3d6ecff9bd.tar.bz2
ayatana-ido-9205e10eedd5dec01aae6f0ca968ab3d6ecff9bd.zip
.build.yml: Drop autogen.sh support; Run unit tests in build_scripts: target.
-rw-r--r--.build.yml25
1 files changed, 5 insertions, 20 deletions
diff --git a/.build.yml b/.build.yml
index c88fe2d..837dc50 100644
--- a/.build.yml
+++ b/.build.yml
@@ -6,12 +6,10 @@ requires:
- clang
- gcc
- git
- - make
- startup-notification
- which
- cmake
- cmake-extras
- - mate-common
- glib2
- gobject-introspection
- gtk3
@@ -22,14 +20,12 @@ requires:
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido
- - autopoint
- clang
- clang-tools
- cppcheck
- git
- cmake
- cmake-extras
- - mate-common
- gobject-introspection
- gtk-doc-tools
- libgirepository1.0-dev
@@ -45,14 +41,12 @@ requires:
- xvfb
ubuntu:
- - autopoint
- clang
- clang-tools
- cppcheck
- git
- cmake
- cmake-extras
- - mate-common
- gobject-introspection
- gtk-doc-tools
- libgirepository1.0-dev
@@ -91,10 +85,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
@@ -117,15 +108,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 ./autogen.sh ]; then
- - ${XVFB_RUN} make check
- - elif [ -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