From 95b544ed0a59fc635d3e57983e72c1cfff9d0a70 Mon Sep 17 00:00:00 2001
From: Tony Baltovski <tbaltovski@clearpathrobotics.com>
Date: Fri, 27 Sep 2019 12:51:58 -0400
Subject: [PATCH] Updated TravisCI for Kinetic and Melodic.

---
 .travis.yml | 55 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2713774..34dbc3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,32 @@
-sudo: required
-dist: trusty
-language: generic
-compiler:
-  - gcc
-  - clang
+# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
+# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
+
+language: generic # optional, just removes the language badge
+
+services:
+  - docker
+
+# include the following block if the C/C++ build artifacts should get cached by Travis,
+# CCACHE_DIR needs to get set as well to actually fill the cache
+cache:
+  directories:
+    - $HOME/.ccache
+
+git:
+  quiet: true # optional, silences the cloning of the target repository
+
+# configure the build environment(s)
+# https://github.com/ros-industrial/industrial_ci/blob/master/doc/index.rst#variables-you-can-configure
 env:
-  - CC=gcc CXX=g++
-  - CC=clang CXX=clang++
+  global: # global settings for all jobs
+    - ROS_REPO=ros
+    - CCACHE_DIR=$HOME/.ccache # enables C/C++ caching in industrial_ci
+  matrix: # each line is a job
+    - ROS_DISTRO="kinetic"
+    - ROS_DISTRO="melodic"
+
+# clone and run industrial_ci
 install:
-  - export CI_ROS_DISTRO=indigo
-  - sudo sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list'
-  - wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
-  - sudo apt-get update
-  - sudo apt-get install python-rosdep -y
-  - sudo `which rosdep` init
-  - rosdep update
-  - rosdep install --default-yes --from-paths . --ignore-src --rosdistro $CI_ROS_DISTRO
+  - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci -b master
 script:
-  - mkdir -p ~/catkin_ws/src
-  - ln -s $TRAVIS_BUILD_DIR ~/catkin_ws/src/repo
-  - cd ~/catkin_ws
-  - source /opt/ros/$CI_ROS_DISTRO/setup.bash
-  - catkin_make
-  - catkin_make run_tests
-  - catkin_test_results .
-  - catkin_make install
-notifications:
-  email: false
+  - .industrial_ci/travis.sh