Skip to content

Commit

Permalink
[Travis] Add Ubuntu 20.04, OSX XCode 11.5 jobs (#2953)
Browse files Browse the repository at this point in the history
* [Travis] Add Ubuntu 20.04, OSX XCode 11.5 jobs

* Add ROS Noetic for Ubuntu 20.04

* Install Python3 libraries

* Install catkin_tools from source for Ubuntu 20.04
  • Loading branch information
rajat2004 authored Oct 3, 2020
1 parent f423d9f commit 05a9625
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ jobs:
os: linux
dist: bionic

- name: Ubuntu 20.04
os: linux
dist: focal

- name: Ubuntu 16.04
os: linux
dist: xenial
Expand All @@ -16,10 +20,14 @@ jobs:
- MSBUILD_PATH="c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\16.0\Bin"
- PATH_FIX="C:\Windows\System32"

- name: MacOS
- name: XCode 11.4.1
os: osx
osx_image: xcode11.4

- name: XCode 11.5
os: osx
osx_image: xcode11.5


before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
Expand Down
20 changes: 14 additions & 6 deletions tools/install_ros_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
set -x

DISTRO="$(lsb_release -sc)"
if [[ "$DISTRO" == "bionic" ]]; then
if [[ "$DISTRO" == "focal" ]]; then
ROS_DISTRO="noetic"
elif [[ "$DISTRO" == "bionic" ]]; then
ROS_DISTRO="melodic"
elif [[ "$DISTRO" == "xenial" ]]; then
ROS_DISTRO="kinetic"
Expand All @@ -13,11 +15,12 @@ sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main
sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654

sudo apt update
sudo apt install ros-$ROS_DISTRO-desktop-full
sudo apt install -qq ros-$ROS_DISTRO-desktop-full

echo "source /opt/ros/$ROS_DISTRO/setup.bash" >> ~/.bashrc

sudo apt install python-rosdep python-rosinstall python-rosinstall-generator python-wstool build-essential
sudo apt install python3-pip python3-yaml python3-setuptools
sudo pip3 install rosdep rosinstall rospkg catkin-pkg
sudo rosdep init
rosdep update

Expand All @@ -29,6 +32,11 @@ if [[ "$DISTRO" == "xenial" ]]; then
fi

sudo apt-get install gcc-8 g++-8
sudo apt-get install ros-$ROS_DISTRO-mavros*
sudo apt-get install ros-$ROS_DISTRO-tf2-sensor-msgs
sudo apt-get install python-catkin-tools
sudo apt-get install ros-$ROS_DISTRO-mavros* ros-$ROS_DISTRO-tf2-sensor-msgs

# TODO: Remove this if-block when new 0.7.0 release of catkin_tools is available
if [[ "$DISTRO" == "focal" ]]; then
sudo pip3 install "git+https://github.com/catkin/catkin_tools.git#egg=catkin_tools"
else
sudo pip3 install catkin-tools
fi

0 comments on commit 05a9625

Please sign in to comment.