Skip to content

Commit

Permalink
Merge pull request jsk-ros-pkg#14 from garaemon/not-run-rodep-all
Browse files Browse the repository at this point in the history
do not run rosdep install -a on travis
  • Loading branch information
garaemon committed Apr 1, 2014
2 parents 4fd5429 + 1b96ab2 commit 2fadd48
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions .rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
- svn:
uri: https://svn.code.sf.net/p/tum-ros-pkg/code/highlevel/SnapMapICP
local-name: tum-ros-pkg/highlevel/SnapMapICP
- git:
uri: https://github.com/ahornung/nao_robot.git
local-name: humanoid_stacks/nao_robot
- svn:
uri: http://svn.code.sf.net/p/bosch-ros-pkg/code/trunk/stacks/bosch_shared_autonomy
local-name: bosch-ros-pkg/stacks/bosch_shared_autonomy
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ python:
compiler:
- gcc
env:
- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="jsk_baxter_robot jsk_nao_robot jsk_pr2_accessories jsk_pr2_desktop jsk_pr2_startup pr2_base_trajectory_action"
- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="jsk_baxter_robot jsk_nao_robot jsk_pr2_accessories jsk_pr2_desktop jsk_pr2_startup pr2_base_trajectory_action"
- ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin
- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin
#notifications:
Expand Down Expand Up @@ -48,8 +48,8 @@ install: # Use this to install any prerequisites or dependencies necessary to ru
- find -L src -name package.xml -exec dirname {} \; | xargs -n 1 -i find {} -name manifest.xml | xargs -n 1 -i mv {} {}.deprecated
- rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y
- find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml
- if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi
- if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps ros-$ROS_DISTRO-pr2-arm-navigation ros-$ROS_DISTRO-pr2-interactive-manipulation; fi
- if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y; fi
- if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps ros-$ROS_DISTRO-pr2-arm-navigation ros-$ROS_DISTRO-pr2-interactive-manipulation ros-$ROS_DISTRO-nao-msgs; fi
before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc.
- source /opt/ros/$ROS_DISTRO/setup.bash
- export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`"
Expand Down

0 comments on commit 2fadd48

Please sign in to comment.