Skip to content

Commit

Permalink
Merge pull request #348 from ipa-fxm/travis_extensions
Browse files Browse the repository at this point in the history
Travis extensions
  • Loading branch information
Jannik Abbenseth authored Jul 31, 2017
2 parents e638c56 + 7645017 commit 04202f3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.rosinstall.jade

This file was deleted.

12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +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="jade" 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="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- 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:
Expand Down

0 comments on commit 04202f3

Please sign in to comment.