summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Xiaotian <[email protected]>2019-02-06 09:33:49 +0800
committerraveit65 <[email protected]>2019-02-06 09:44:29 +0100
commit14fce6f47cebae7c21b0a5f4d62409e047027187 (patch)
treeb437e32a07278eb55f5dd3f7d3ee45727817d5bc
parent15e3a6863829e5760b0b21b80527d2dba427c203 (diff)
downloadmate-panel-14fce6f47cebae7c21b0a5f4d62409e047027187.tar.bz2
mate-panel-14fce6f47cebae7c21b0a5f4d62409e047027187.tar.xz
Test the new docker-build
-rw-r--r--.travis.yml26
1 files changed, 12 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index f6e63785..52f64dfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,6 @@ language: bash
services:
- docker
-# Use travis branch for test.
-#branches:
-# only:
-# - travis
-
before_install:
- curl -L -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/travis/travis/docker-build
- chmod +x docker-build
@@ -137,19 +132,22 @@ variables:
before_scripts:
- cd ${START_DIR}
- - if [ ! -d mate-menus-build ]; then git clone --depth 1 https://github.com/mate-desktop/mate-menus.git mate-menus-build;fi
+ - if [ ! -d mate-menus-build ]; then
+ - git clone --depth 1 https://github.com/mate-desktop/mate-menus.git mate-menus-build
+ - fi
- cd mate-menus-build
- - ./autogen.sh
- 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 > /dev/null 2>&1
+ - ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu
- else
- - ./autogen.sh --prefix=/usr > /dev/null 2>&1
+ - ./autogen.sh --prefix=/usr
+ - fi
+ - if [ ${TRAVIS} == "false" ]; then
+ - make clean
- fi
- - if [ ${TRAVIS} == "false" ]; then make clean; fi
- - make > /dev/null 2>&1
- - make install > /dev/null 2>&1
+ - make
+ - make install
after_scripts:
- - make distcheck > /dev/null
+ - make distcheck
# Just look at the error output and return 0 always.
- - 'if [ $? -ne 0 ];then RED="\033[0;31m"; NC="\033[0m"; printf "${RED}!!! ERROR: Run make distcheck failed.${NC}\n"; fi'
+ - 'if [ $? -ne 0 ];then RED="\033[0;31m"; ENDC="\033[0m"; printf "${RED}!!! ERROR: Run make distcheck failed.${ENDC}\n"; fi'