Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Just update .travis.yml for melodic #197

Merged
merged 9 commits into from
May 8, 2018
16 changes: 12 additions & 4 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ 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

apt-get update -qq && apt-get install -qq -y -q wget sudo lsb-release gnupg # for docker

# Setup ccache
Expand All @@ -36,7 +42,7 @@ sudo sh -c "echo \"deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_rele
wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
sudo apt-get update -qq
# Install ROS
sudo apt-get install -qq -y python-catkin-pkg python-catkin-tools python-rosdep python-wstool ros-$ROS_DISTRO-catkin
sudo -E apt-get install -qq -y python-catkin-pkg python-catkin-tools python-rosdep python-wstool ros-$ROS_DISTRO-catkin
source /opt/ros/$ROS_DISTRO/setup.bash
# Setup for rosdep
sudo rosdep init
Expand Down Expand Up @@ -75,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
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@ services:
- docker
cache: ccache
env:
global:
- ROS_DISTRO=lunar
matrix:
- DOCKER_IMAGE=debian:stretch
- DOCKER_IMAGE=ubuntu:xenial
# Test the target distro.
- ROS_DISTRO=melodic DOCKER_IMAGE=debian:stretch
- 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 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.
- export CI_SOURCE_PATH=$(pwd)
- export REPOSITORY_NAME=${PWD##*/}
- export ROS_PARALLEL_JOBS='-j8 -l6'
script:
- echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
- docker run --rm -i -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -v $HOME:$HOME -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -e "ROS_DISTRO=$ROS_DISTRO" -e "ROS_PARALLEL_JOBS=$ROS_PARALLEL_JOBS" -e "DOCKER_IMAGE=$DOCKER_IMAGE" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# perception_pcl

[![Build Status](https://travis-ci.org/ros-perception/perception_pcl.svg?branch=lunar-devel)](https://travis-ci.org/ros-perception/perception_pcl)
[![Build Status](https://travis-ci.org/ros-perception/perception_pcl.svg?branch=melodic-devel)](https://travis-ci.org/ros-perception/perception_pcl)

PCL (Point Cloud Library) ROS interface stack. PCL-ROS is the preferred
bridge for 3D applications involving n-D Point Clouds and 3D geometry
Expand Down
9 changes: 7 additions & 2 deletions pcl_conversions/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6.3)
cmake_minimum_required(VERSION 2.8)
project(pcl_conversions)

find_package(catkin REQUIRED COMPONENTS)
Expand All @@ -13,7 +13,12 @@ find_package(Eigen3 REQUIRED)
# configure properly. Here we remove those bogus entries so that downstream
# consumers of this package succeed.
if(NOT "${PCL_INCLUDE_DIRS}" STREQUAL "")
list(FILTER PCL_INCLUDE_DIRS EXCLUDE REGEX "/usr/include/.*-linux-gnu/freetype2")
foreach(item ${PCL_INCLUDE_DIRS})
string(REGEX MATCH "/usr/include/.*-linux-gnu/freetype2" item ${item})
if(item)
list(REMOVE_ITEM PCL_INCLUDE_DIRS ${item})
endif()
endforeach()
endif()

catkin_package(
Expand Down