From 9b4d31c9125c6830f80693d11431e57c4bdbe208 Mon Sep 17 00:00:00 2001 From: Kentaro Wada Date: Thu, 3 May 2018 04:54:48 +0900 Subject: [PATCH] Add NOT_TEST_INSTALL option to .travis.sh --- .travis.sh | 11 ++++++++--- .travis.yml | 10 +++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.sh b/.travis.sh index 022dc8f2..b8ec99b8 100755 --- a/.travis.sh +++ b/.travis.sh @@ -22,6 +22,9 @@ function travis_time_end { set -x } +# Default configuration +test "$NOT_TEST_INSTALL" = "" && export NOT_TEST_INSTALL=false + # Mainly for https://github.com/ros-perception/perception_pcl/pull/197#issuecomment-386056906 export DEBIAN_FRONTEND=noninteractive @@ -78,7 +81,9 @@ cd ~/catkin_ws catkin build -p1 -j1 catkin run_tests -p1 -j1 catkin_test_results --all build -catkin clean -b --yes -catkin config --install -catkin build -p1 -j1 +if [ "$NOT_TEST_INSTALL" != "true" ]; then + catkin clean -b --yes + catkin config --install + catkin build -p1 -j1 +fi travis_time_end diff --git a/.travis.yml b/.travis.yml index b6a4aa4c..68f5b38d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,11 @@ env: - ROS_DISTRO=melodic DOCKER_IMAGE=ubuntu:artful - ROS_DISTRO=melodic DOCKER_IMAGE=ubuntu:bionic # To test backward compatibility for users who build from source. - - ROS_DISTRO=lunar DOCKER_IMAGE=debian:stretch - - ROS_DISTRO=lunar DOCKER_IMAGE=ubuntu:xenial - - ROS_DISTRO=kinetic DOCKER_IMAGE=debian:jessie - - ROS_DISTRO=kinetic DOCKER_IMAGE=ubuntu:xenial - - ROS_DISTRO=indigo DOCKER_IMAGE=ubuntu:trusty + - ROS_DISTRO=lunar DOCKER_IMAGE=debian:stretch NOT_TEST_INSTALL=true + - ROS_DISTRO=lunar DOCKER_IMAGE=ubuntu:xenial NOT_TEST_INSTALL=true + - ROS_DISTRO=kinetic DOCKER_IMAGE=debian:jessie NOT_TEST_INSTALL=true + - ROS_DISTRO=kinetic DOCKER_IMAGE=ubuntu:xenial NOT_TEST_INSTALL=true + - ROS_DISTRO=indigo DOCKER_IMAGE=ubuntu:trusty NOT_TEST_INSTALL=true # Install system dependencies, namely ROS. before_install: # Define some config vars.