diff options
-rw-r--r-- | .build.yml | 20 | ||||
-rw-r--r-- | .travis.yml | 8 |
2 files changed, 11 insertions, 17 deletions
@@ -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 @@ -83,21 +84,14 @@ variables: -enable-checker security.insecureAPI.strcpy"' before_scripts: - - cd ${START_DIR} - - '[ -f mate-common-1.24.1.tar.xz ] || curl -Ls -o mate-common-1.24.1.tar.xz https://github.com/mate-desktop/mate-common/releases/download/v1.24.1/mate-common-1.24.1.tar.xz' - - tar xf mate-common-1.24.1.tar.xz - - cd mate-common-1.24.1 - - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then - - ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu - - else - - ./configure --prefix=/usr - - fi - - make - - make install build_scripts: - NOCONFIGURE=1 ./autogen.sh - - scan-build $CHECKERS ./configure + - if [ ${DISTRO_NAME} == "debian" ];then + - scan-build $CHECKERS ./configure --with-ayatana-indicators=yes + - else + - scan-build $CHECKERS ./configure + - fi - if [ $CPU_COUNT -gt 1 ]; then - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT - else diff --git a/.travis.yml b/.travis.yml index 7f16c67..43d6481 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ # vim: set ts=2 sts=2 sw=2 expandtab : -dist: bionic +dist: focal language: shell os: linux services: @@ -23,7 +23,7 @@ script: notifications: irc: - if: branch = "1.24" AND + if: (tag OR branch = "1.24") AND repo = "mate-desktop/mate-indicator-applet" channels: - "irc.freenode.org#mate-dev" @@ -42,7 +42,7 @@ deploy: condition: "${TRAVIS_TAG} =~ ^v.*$ && ${DISTRO} =~ ^fedora.*$" env: - - DISTRO="archlinux:latest" +# - DISTRO="archlinux:latest" - DISTRO="debian:testing" - DISTRO="fedora:latest" - - DISTRO="ubuntu:20.04" +# - DISTRO="ubuntu:rolling" |