Skip to content

Commit 302dbdb

Browse files
committed
cleanup .travis.yml
1 parent 8550237 commit 302dbdb

File tree

2 files changed

+7
-25
lines changed

2 files changed

+7
-25
lines changed

.travis.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,26 @@ node_js:
66
- "2"
77
- "3"
88
- "4"
9-
addons:
10-
firefox: "31.0" # 3.4->31.0
11-
os:
12-
- linux
9+
env:
10+
- ROS_DISTRO=hydro
11+
1312
before_install:
1413
# ROS deps for examples
1514
- sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
1615
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
1716
- sudo apt-get update -qq
18-
- sudo apt-get install ros-hydro-ros-base
19-
# temp local install of tf2_web_republisher
20-
# - sudo apt-get install ros-hydro-rosbridge-server ros-hydro-tf2-web-republisher ros-hydro-common-tutorials ros-hydro-rospy-tutorials ros-hydro-actionlib-tutorials
21-
- sudo apt-get install ros-hydro-rosbridge-server ros-hydro-common-tutorials ros-hydro-rospy-tutorials ros-hydro-actionlib-tutorials
22-
- sudo apt-get install python-catkin-pkg python-rosdep ros-hydro-catkin -qq
23-
- sudo rosdep init
24-
- rosdep update
25-
- mkdir -p /tmp/ws/src
26-
- ln -s `pwd` /tmp/ws/roslibjs
27-
- cd /tmp/ws/src
28-
- git clone https://github.com/RobotWebTools/tf2_web_republisher.git
29-
- cd ../
30-
- rosdep install --from-paths src --ignore-src --rosdistro hydro -y
31-
- cd /tmp/ws/roslibjs
17+
- sudo apt-get install -qq ros-$ROS_DISTRO-ros ros-$ROS_DISTRO-catkin python-catkin-pkg python-rosdep
18+
- sudo apt-get install -qq ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials
3219

3320
# Only update npm in the 0.8 and 0.10 versions to not run into this issue:
3421
# https://github.com/nodejs/node/issues/433
3522
- case ${TRAVIS_NODE_VERSION} in 0.8*|0.10*) npm update -g npm ;; esac
36-
- npm install -g grunt-cli karma-cli
3723

3824
# Set up Xfvb for Firefox headless testing
3925
- "export DISPLAY=:99.0"
4026
- "sh -e /etc/init.d/xvfb start"
4127
before_script:
42-
- source /opt/ros/hydro/setup.bash
43-
- cd /tmp/ws
44-
- catkin_make
45-
- catkin_make install
46-
- source install/setup.bash
47-
- cd /tmp/ws/roslibjs
28+
- source /opt/ros/$ROS_DISTRO/setup.bash
4829
- sh test/examples/setup_examples.sh
4930
script:
5031
- rostopic list

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"devDependencies": {
1717
"grunt": "~0.4.1",
1818
"grunt-browserify": "^3.0.1",
19+
"grunt-cli": "^0.1.13",
1920
"grunt-contrib-clean": "~0.4.0",
2021
"grunt-contrib-jshint": "^0.10.0",
2122
"grunt-contrib-uglify": "~0.2.0",

0 commit comments

Comments
 (0)