From 3dd2c54425209719dcdbc4f688f522c474bfed0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Tue, 2 Jul 2019 13:53:32 +0200 Subject: [PATCH] [WIP] migrate to new industrial_ci version --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 717c2242..2498863a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -sudo: required -dist: trusty language: generic +services: + - docker cache: directories: @@ -10,18 +10,18 @@ env: global: - CCACHE_DIR=$HOME/.ccache matrix: - - ROS_DISTRO="kinetic" ROS_REPO=ros NOT_TEST_INSTALL=true - - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true - - ROS_DISTRO="kinetic" ROS_REPO=ros NOT_TEST_INSTALL=true UPSTREAM_WORKSPACE=file - - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true UPSTREAM_WORKSPACE=file + - ROS_DISTRO="kinetic" ROS_REPO=ros + - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed + - ROS_DISTRO="kinetic" ROS_REPO=ros UPSTREAM_WORKSPACE=.travis.rosinstall.kinetic + - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=.travis.rosinstall.kinetic - ROS_DISTRO="kinetic" CLANG_FORMAT_CHECK=file - ROS_DISTRO="kinetic" PRERELEASE=true matrix: allow_failures: - - env: ROS_DISTRO="kinetic" ROS_REPO=ros NOT_TEST_INSTALL=true - - env: ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true + - env: ROS_DISTRO="kinetic" ROS_REPO=ros + - env: ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed install: - - git clone --depth=1 https://github.com/ros-industrial/industrial_ci.git .ci_config + - git clone --depth=1 https://github.com/ipa-mdl/industrial_ci.git .ci_config -b colcon-rebase script: - .ci_config/travis.sh