From 24b898a0111f9212a6bbcc1db607b5cc345ca5e4 Mon Sep 17 00:00:00 2001 From: Robert Antoni Buj Gelonch Date: Mon, 22 Feb 2021 22:42:03 +0100 Subject: Merge pull request #69 from mate-desktop/debian-ci-fix Travis CI: debian build: Use Ayatana Indicators --- .build.yml | 9 +++++++-- .travis.yml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.build.yml b/.build.yml index baefb4c..4196ecd 100644 --- a/.build.yml +++ b/.build.yml @@ -26,7 +26,8 @@ requires: - gcc - git - libgtk-3-dev - - libindicator3-dev + - libayatana-ido3-dev + - libayatana-indicator3-dev - libmate-panel-applet-dev - libtool - libx11-dev @@ -103,7 +104,11 @@ build_scripts: - fi - NOCONFIGURE=1 ./autogen.sh - - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum + - if [ ${DISTRO_NAME} == "debian" ];then + - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum --with-ayatana-indicators=yes + - else + - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum + - fi - if [ $CPU_COUNT -gt 1 ]; then - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT diff --git a/.travis.yml b/.travis.yml index 4a33216..70be534 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,4 +72,4 @@ env: # - DISTRO="archlinux:latest" - DISTRO="debian:testing" - DISTRO="fedora:latest" - - DISTRO="ubuntu:devel" + - DISTRO="ubuntu:rolling" -- cgit v1.2.1