aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-09-02 14:02:30 +0200
committerRobert Tari <robert@tari.in>2021-09-02 14:02:30 +0200
commitd08fc80c81644510a24e2c8920cf6f2831ee2326 (patch)
tree9bc9c296358f6a1a6fc63ad628cf2d5afcf9c0d1
parentf30a2b965da66852b0e27a93b86677276ec81b7a (diff)
parentf16cedf9b3a14330347e4d7c9fbacfe507ae88e3 (diff)
downloadayatana-ido-d08fc80c81644510a24e2c8920cf6f2831ee2326.tar.gz
ayatana-ido-d08fc80c81644510a24e2c8920cf6f2831ee2326.tar.bz2
ayatana-ido-d08fc80c81644510a24e2c8920cf6f2831ee2326.zip
Merge branch 'sunweaver-pr/ubuntu-CI-builds-run-unittests'
Attributes GH PR #48: https://github.com/AyatanaIndicators/ayatana-ido/pull/48
-rw-r--r--.build.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.build.yml b/.build.yml
index af3b24d..fe1cd4a 100644
--- a/.build.yml
+++ b/.build.yml
@@ -92,7 +92,7 @@ build_scripts:
- NOCONFIGURE=1 ./autogen.sh
- scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
- 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
@@ -118,7 +118,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