From 7e93759d79d8d750f5f271e97ca6107620b91041 Mon Sep 17 00:00:00 2001 From: ipa-fxm Date: Mon, 31 Jul 2017 10:57:13 +0200 Subject: [PATCH 1/2] remove jade jobs --- .travis.rosinstall.jade | 1 - .travis.yml | 4 ---- 2 files changed, 5 deletions(-) delete mode 120000 .travis.rosinstall.jade diff --git a/.travis.rosinstall.jade b/.travis.rosinstall.jade deleted file mode 120000 index 88265f922..000000000 --- a/.travis.rosinstall.jade +++ /dev/null @@ -1 +0,0 @@ -.travis.rosinstall.kinetic \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1b54b909a..01e07c727 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,7 @@ env: - UPSTREAM_WORKSPACE=file matrix: - ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu -matrix: - allow_failures: - - env: ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config script: From 7645017d967359d38949e60bfc571ad47975cffd Mon Sep 17 00:00:00 2001 From: ipa-fxm Date: Mon, 31 Jul 2017 10:57:40 +0200 Subject: [PATCH 2/2] add debian jobs --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01e07c727..7aba11154 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,16 @@ notifications: on_failure: always env: global: - - UPSTREAM_WORKSPACE=file + - ROS_REPO=ros matrix: - - ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu + - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file + - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian +matrix: + allow_failures: + - env: ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian + - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config script: