Skip to content

Commit

Permalink
removed unneeded stuff from travis.yml and re-configured package.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
mstuettgen committed Mar 4, 2015
1 parent 6639a99 commit 0b2f277
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 25 deletions.
18 changes: 0 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ compiler:
#- clang
env:
global:
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
# via the "travis encrypt" command using the project repo's public key
#- secure: "ieyA/jKHN1rVAQ8qFvXx6wdcUozFR5QBxUpQuEcItl4yv0bPnRp0xO9X/BhNFt6V85L8jEw9XNz4uHTUeAtghZZxpKCQ8de1NP49d7boyCTLQx/WsJ/bSPubAZOcnvbi9SoOTyymM94jdA1k46ndznI1ZZ713uSrPdIcg6o8Q9A="
- ROS_DISTRO=hydro # wait until travis will update to 14.04
matrix:
#- MAVLINK_DIALECT=common
#- MAVLINK_DIALECT=pixhawk

before_install:
- export CI_SOURCE_PATH=$(pwd)
Expand Down Expand Up @@ -49,18 +43,6 @@ after_failure:
- find ${HOME}/.ros/test_results -type f -exec echo "== {} ==" \; -exec cat {} \;
- for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat $file; done

#addons:
# coverity_scan:
# project:
# name: "MASKOR/rover"
# description: "Build submitted via Travis CI"
# notification_email: [email protected]
# build_command_prepend: cd ~/ros/ws_$REPOSITORY_NAME/src/rover &&
# ln -s /opt/ros/$ROS_DISTRO/share/catkin/cmake/toplevel.cmake CMakeLists.txt &&
# cmake .
# build_command: make -j4
# branch_pattern: coverity_scan

notifications:
webhooks:
urls:
Expand Down
9 changes: 6 additions & 3 deletions rover_bringup/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-->build_depend>mavros</build_depend-->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use run_depend for packages you need at runtime: -->
<!-- Use test_depend for packages you need only for testing: -->
<run_depend>mavros</run_depend>
<run_depend>openni2</run_depend>
<run_depend>openni2_launch</run_depend>
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>

Expand Down
8 changes: 4 additions & 4 deletions rover_nodes/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
<!-- <maintainer email="[email protected]">Jane Doe</maintainer> -->
<maintainer email="[email protected]">mstuettgen</maintainer>
<maintainer email="[email protected]">Marcel Stuettgen</maintainer>


<!-- One license tag required, multiple allowed, one license per tag -->
Expand Down Expand Up @@ -40,10 +40,10 @@
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>joy_msgs</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>mavros</build_depend>
<build_depend>roscpp</build_depend>
<run_depend>joy_msgs</run_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>mavros</run_depend>
<run_depend>roscpp</run_depend>

Expand All @@ -56,4 +56,4 @@
<!-- Other tools can request additional information be placed here -->

</export>
</package>
</package>

0 comments on commit 0b2f277

Please sign in to comment.