Skip to content

Commit 19502fd

Browse files
committed
cleanup .travis.yml
1 parent 0a0213a commit 19502fd

File tree

2 files changed

+7
-25
lines changed

2 files changed

+7
-25
lines changed

.travis.yml

+6-25
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,26 @@ node_js:
33
- "0.10"
44
- "0.12"
55
- "4"
6-
addons:
7-
firefox: "31.0" # 3.4->31.0
8-
os:
9-
- linux
6+
env:
7+
- ROS_DISTRO=hydro
8+
109
before_install:
1110
# ROS deps for examples
1211
- sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
1312
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
1413
- sudo apt-get update -qq
15-
- sudo apt-get install ros-hydro-ros-base
16-
# temp local install of tf2_web_republisher
17-
# - 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
18-
- sudo apt-get install ros-hydro-rosbridge-server ros-hydro-common-tutorials ros-hydro-rospy-tutorials ros-hydro-actionlib-tutorials
19-
- sudo apt-get install python-catkin-pkg python-rosdep ros-hydro-catkin -qq
20-
- sudo rosdep init
21-
- rosdep update
22-
- mkdir -p /tmp/ws/src
23-
- ln -s `pwd` /tmp/ws/roslibjs
24-
- cd /tmp/ws/src
25-
- git clone https://github.com/RobotWebTools/tf2_web_republisher.git
26-
- cd ../
27-
- rosdep install --from-paths src --ignore-src --rosdistro hydro -y
28-
- cd /tmp/ws/roslibjs
14+
- sudo apt-get install -qq ros-$ROS_DISTRO-ros ros-$ROS_DISTRO-catkin python-catkin-pkg python-rosdep
15+
- 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
2916

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

3521
# Set up Xfvb for Firefox headless testing
3622
- "export DISPLAY=:99.0"
3723
- "sh -e /etc/init.d/xvfb start"
3824
before_script:
39-
- source /opt/ros/hydro/setup.bash
40-
- cd /tmp/ws
41-
- catkin_make
42-
- catkin_make install
43-
- source install/setup.bash
44-
- cd /tmp/ws/roslibjs
25+
- source /opt/ros/$ROS_DISTRO/setup.bash
4526
- sh test/examples/setup_examples.sh
4627
script:
4728
- rostopic list

package.json

+1
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)