summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-10-14 09:42:16 +0200
committerraveit65 <[email protected]>2019-10-14 13:23:19 +0200
commit0470814242979fdf1fe3d78b8e203edf87156bdd (patch)
treed81b0545895ae7d5e8e9ecce488c15916c780fef
parent521d6205d3bc9a2e1071c60a40f6c777a7c8bab9 (diff)
downloadmate-control-center-0470814242979fdf1fe3d78b8e203edf87156bdd.tar.bz2
mate-control-center-0470814242979fdf1fe3d78b8e203edf87156bdd.tar.xz
Travis CI: don't build mate-menus from tarball
-rw-r--r--.travis.yml22
1 files changed, 3 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index 2face7a5..2ef3efae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -148,6 +148,7 @@ requires:
- librsvg2-tools
- make
- marco-devel
+ - mate-menus-devel
- polkit-devel
- python3-lxml
- mate-common
@@ -235,23 +236,6 @@ before_scripts:
- make install
- cd ${START_DIR}
- - if [ ! -f mate-menus-1.22.0.tar.xz ];then
- - curl -Ls -o mate-menus-1.22.0.tar.xz https://github.com/mate-desktop/mate-menus/releases/download/v1.22.0/mate-menus-1.22.0.tar.xz
- - fi
- - tar xf mate-menus-1.22.0.tar.xz
- - cd mate-menus-1.22.0
- - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then
- - ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu
- - else
- - ./autogen.sh --prefix=/usr
- - fi
- - if [ ${TRAVIS} == "false" ]; then
- - make clean
- - fi
- - make
- - make install
-
- - cd ${START_DIR}
- if [ ! -f mate-settings-daemon-1.23.1.tar.xz ]; then
- curl -Ls -o mate-settings-daemon-1.23.1.tar.xz https://github.com/mate-desktop/mate-settings-daemon/releases/download/v1.23.1/mate-settings-daemon-1.23.1.tar.xz
- fi
@@ -275,12 +259,12 @@ build_scripts:
- scan-build $CHECKERS ./configure
- scan-build $CHECKERS --keep-cc -o html-report make -j $(( $CPU_COUNT + 1 ))
- if [ ${DISTRO_NAME} == "debian" ];then
- - cppcheck --enable=warning,style,performance,portability,information,missingInclude -i'mate-desktop-1.23.2' -i'mate-menus-1.22.0' -i'mate-settings-daemon-1.23.1' .
+ - cppcheck --enable=warning,style,performance,portability,information,missingInclude -i'mate-desktop-1.23.2' -i'mate-settings-daemon-1.23.1' .
- fi
after_scripts:
- if [ ${DISTRO_NAME} == "fedora" ];then
- - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude -i'mate-desktop-1.23.2' -i'mate-menus-1.22.0' -i'mate-settings-daemon-1.23.1' .
+ - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude -i'mate-desktop-1.23.2' -i'mate-settings-daemon-1.23.1' .
- cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport
- ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/categories/preferences-desktop.png
- fi