From 9c2a092141cdd99face4a3d5fde3e84eecea1eaf Mon Sep 17 00:00:00 2001 From: Bjar Ne <43565432+gleichdick@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:08:38 +0000 Subject: [PATCH 1/2] Add geometry2 --- moveit2.repos | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/moveit2.repos b/moveit2.repos index 3c6989cff4..50d63d10e5 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -45,3 +45,8 @@ repositories: type: git url: https://github.com/ros-planning/warehouse_ros_mongo version: ros2 + + geometry2: + type: git + url: https://github.com/gleichdick/geometry2-1 + version: ros2_new_toMsg_approach From a3bab38d3d8fe8247b8cbbaa666e261d19327f61 Mon Sep 17 00:00:00 2001 From: Bjar Ne <43565432+gleichdick@users.noreply.github.com> Date: Thu, 28 Jan 2021 00:36:06 +0000 Subject: [PATCH 2/2] switch to Rolling --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7584cd1f4c..7e79367f15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,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=foxy + - ROS_DISTRO=rolling - ROS_REPO=ros - UPSTREAM_WORKSPACE=moveit2.repos - CXXFLAGS="-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls" @@ -22,13 +22,13 @@ env: jobs: fast_finish: true include: - - name: "[Foxy] - clang-format, ament_lint" + - name: "[Rolling] - clang-format, ament_lint" env: TEST="clang-format ament_lint" - - name: "[Foxy] - code-coverage" + - name: "[Rolling] - code-coverage" env: TEST=code-coverage - name: "[Foxy] - gcc (build,test)" env: ROS_DISTRO=foxy - - name: "[Foxy] - clang (build,test,clang-tidy-fix,test_ikfast_plugins)" + - name: "[Rolling] - clang (build,test,clang-tidy-fix,test_ikfast_plugins)" compiler: clang # test_ikfast_plugins takes ~10 minutes: include here to keep the main jobs shorter env: TEST=clang-tidy-fix