From 806e46a68e40383afdbe733e4a0106a0fa8e65b1 Mon Sep 17 00:00:00 2001 From: Henning Kayser Date: Wed, 30 Oct 2019 13:11:19 +0100 Subject: [PATCH] Run travis with vcstool and dashing-ci --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1593bcf7d2..05fa74e11ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ notifications: env: global: - MOVEIT_CI_TRAVIS_TIMEOUT=85 # Travis grants us 90 min, but we add a safety margin of 5 min - - ROS_DISTRO=crystal + - ROS_DISTRO=dashing - ROS_REPO=ros - UPSTREAM_WORKSPACE=moveit.rosinstall - TEST_BLACKLIST=moveit_ros_perception # mesh_filter_test fails due to broken Mesa OpenGL @@ -23,7 +23,7 @@ env: matrix: # TODO(mlautman): Enable these in the future once they pass # - TEST="clang-format ament_lint" - - ROS_DISTRO=crystal + - ROS_DISTRO=dashing # TODO(mlautman): Enable once franka_ikfast_plugin and panda_ikfast_plugin are available # matrix: # Add a separate config to the matrix, using clang as compiler @@ -35,7 +35,7 @@ env: # CXXFLAGS="-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unused-parameter -Wno-unused-function -Wno-overloaded-virtual" before_script: - - git clone -q -b ros2 --depth=1 https://github.com/ros-planning/moveit_ci.git .moveit_ci + - git clone -q -b pr-ros2_vcsool_support --depth=1 https://github.com/PickNikRobotics/moveit_ci.git .moveit_ci script: - .moveit_ci/travis.sh