Skip to content

Commit bce24f2

Browse files
rhaschkedavetcoleman
authored andcommitted
unify Travis config between master and melodic
1 parent 8da0537 commit bce24f2

1 file changed

Lines changed: 14 additions & 16 deletions

File tree

.travis.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
1-
# Test build the MoveIt! tutorials. Author: Dave Coleman
1+
# Test build the MoveIt tutorials. Author: Dave Coleman
22
sudo: required
3-
dist: trusty
3+
dist: xenial
44
language: ruby
55
rvm:
66
- 2.4
77
python:
88
- "2.7"
9-
compiler:
10-
- gcc
9+
cache: ccache
10+
compiler: gcc
1111

1212
before_install: # Use this to prepare the system to install prerequisites or dependencies
1313
# Define some config vars
14+
- export ROS_DISTRO=melodic
15+
- export DOCKER_IMAGE=moveit/moveit:melodic-source
16+
1417
- export NOKOGIRI_USE_SYSTEM_LIBRARIES=true
15-
- export CI_SOURCE_PATH=$(pwd)
1618
- export REPOSITORY_NAME=${PWD##*/}
1719
- echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
1820
- sudo -E sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list'
1921
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
2022
- sudo apt-get update -qq
21-
# Start: there is an issue with postgres on Travis. By removing postgres, the issue is resolved.
22-
# TODO: remove this work-around
23-
- sudo apt-get purge postgresql* -y -qq
24-
- sudo apt-get autoremove -y -qq
25-
- sudo apt-get install synaptic -y -qq
26-
- sudo apt-get update -qq
27-
- sudo apt-get upgrade -y -qq --allow-unauthenticated
28-
- sudo apt-get install postgresql -y -qq
29-
# End: changes made to fix postgresql issue
3023
- sudo apt-get install -qq -y python-rosdep python-wstool python-catkin-tools
3124
# Setup rosdep
3225
- sudo rosdep init
@@ -36,10 +29,15 @@ before_install: # Use this to prepare the system to install prerequisites or dep
3629
- gem --version
3730
- gem install html-proofer
3831
# Install ROS's version of sphinx
39-
- sudo apt-get -qq install ros-indigo-rosdoc-lite
40-
- source /opt/ros/indigo/setup.bash
32+
- sudo apt-get -qq install ros-kinetic-rosdoc-lite
33+
- source /opt/ros/kinetic/setup.bash
34+
35+
before_script:
36+
- git clone -q --depth=1 https://github.com/ros-planning/moveit_ci.git .moveit_ci
4137

4238
script:
39+
# Build tutorial examples
40+
- .moveit_ci/travis.sh
4341
# Test build with non-ROS wrapped Sphinx command to allow warnings and errors to be caught
4442
- sphinx-build -W -b html . native_build
4543
# Test build with ROS-version of Sphinx command so that it is generated same as ros.org

0 commit comments

Comments
 (0)