aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 22:36:34 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 22:36:34 +0200
commit4c32e0f1e0ab0f0a0490bf416fbb4c6359bfcdb7 (patch)
treebcc852aaa0223f9a3caa7d868ff3b487f3b5e998
parentb2beaa3431ac84614ae45f58f2771fb6b97f6201 (diff)
parent11869aed4ff42db66b806697beddf1a23b51de9d (diff)
downloadayatana-indicator-messages-4c32e0f1e0ab0f0a0490bf416fbb4c6359bfcdb7.tar.gz
ayatana-indicator-messages-4c32e0f1e0ab0f0a0490bf416fbb4c6359bfcdb7.tar.bz2
ayatana-indicator-messages-4c32e0f1e0ab0f0a0490bf416fbb4c6359bfcdb7.zip
Merge branch 'tari01-pr/enable-ubuntu-tests'
Attributes GH PR #20: https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/20
-rw-r--r--.build.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.build.yml b/.build.yml
index 203b21e..5bf55a8 100644
--- a/.build.yml
+++ b/.build.yml
@@ -58,6 +58,9 @@ requires:
- libgirepository1.0-dev
- valac
- systemd
+ - libgtest-dev
+ - libdbustest1-dev
+ - python3-dbusmock
variables:
- 'CHECKERS="
@@ -103,7 +106,7 @@ build_scripts:
- scan-build $CHECKERS ./configure --prefix=/usr --disable-tests --enable-gtk-doc --enable-compile-warnings=maximum
- fi
- elif [ -e ./CMakeLists.txt ]; then
- - if [ ${DISTRO_NAME} == "debian" ];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
- scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
@@ -129,7 +132,7 @@ build_scripts:
after_scripts:
- if [ ${BUILD_TYPE} == "scripts" ];then
- XVFB_RUN="$(which xvfb-run || true)"
- - if [ ${DISTRO_NAME} == "debian" ];then
+ - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then
- if [ -e ./autogen.sh ]; then
- ${XVFB_RUN} make check
- elif [ -e ./CMakeLists.txt ]; then