Skip to content

Commit

Permalink
More fix on the travis config
Browse files Browse the repository at this point in the history
  • Loading branch information
willdzeng authored and DI ZENG committed Jul 17, 2019
1 parent 25d05b5 commit 12ec0dc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ cache:
language: generic
matrix:
include:
- name: "Trusty indigo"
dist: trusty
env: ROS_DISTRO=indigo
- name: "Xenial kinetic"
dist: xenial
env: ROS_DISTRO=kinetic

# Configuration variables. All variables are global now, but this can be used to
# trigger a build matrix for different ROS distributions if desired.
env:
global:
- ROS_CI_DESKTOP="`lsb_release -cs`" # e.g. [precise|trusty|...]
- ROS_CI_DESKTOP="`lsb_release -cs`" # e.g. [trusty|xenial|...]
- CI_SOURCE_PATH=$(pwd)
- ROSINSTALL_FILE=$CI_SOURCE_PATH/dependencies.rosinstall
- CATKIN_OPTIONS=$CI_SOURCE_PATH/catkin.options
Expand All @@ -69,14 +69,14 @@ env:
# Install system dependencies, namely a very barebones ROS setup.
before_install:
- sudo sh -c "echo \"deb http://packages.ros.org/ros/ubuntu $ROS_CI_DESKTOP main\" > /etc/apt/sources.list.d/ros-latest.list"
- sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
- sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
- sudo apt-get update -qq
- sudo apt-get install dpkg
- sudo apt-get install -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-ros-base
- source /opt/ros/$ROS_DISTRO/setup.bash
# Prepare rosdep to install dependencies.
- sudo rosdep init
- rosdep update
- rosdep update --include-eol-distros # Support EOL distros.

# Create a catkin workspace with the package under integration.
install:
Expand Down

0 comments on commit 12ec0dc

Please sign in to comment.