From 3c27ffae797e015ed078a0dfbd1646b287b0b116 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 3 Jul 2019 10:39:06 +0200 Subject: [PATCH 1/4] Add Fast-RTPS to CI source dependencies --- ci_source_deps.repos | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci_source_deps.repos b/ci_source_deps.repos index a50b5f6..9a907a2 100644 --- a/ci_source_deps.repos +++ b/ci_source_deps.repos @@ -1,4 +1,8 @@ repositories: + eProsima/Fast-RTPS: + type: git + url: https://github.com/eProsima/Fast-RTPS.git + version: master ros2/rmw: type: git url: https://github.com/ros2/rmw.git From 16c5562cd2c39c602cc1b6b3cd30376bd8d7bf90 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 3 Jul 2019 13:08:52 +0200 Subject: [PATCH 2/4] Purge fastrtps for CI --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a3f9d0..914fe2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ before_script: - apt-get update - rosdep update - rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers" + - apt-get purge -y ros-dashing-fastrtps - lttng-sessiond --daemonize # build: From fa5ce8331fb90e52c016326e77cfcabfb383456e Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 3 Jul 2019 13:09:14 +0200 Subject: [PATCH 3/4] Add fastrtps source dependency to CI deps --- ci_source_deps.repos | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci_source_deps.repos b/ci_source_deps.repos index 9a907a2..b09c060 100644 --- a/ci_source_deps.repos +++ b/ci_source_deps.repos @@ -18,3 +18,7 @@ repositories: type: git url: https://github.com/ros2/rcpputils.git version: master + ros2/rosidl_typesupport_fastrtps: + type: git + url: https://github.com/ros2/rosidl_typesupport_fastrtps.git + version: master From 198ae0d009e857ebc2c064d8d57b156931e157d4 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 3 Jul 2019 13:10:09 +0200 Subject: [PATCH 4/4] Re-order CI dependencies list --- ci_source_deps.repos | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci_source_deps.repos b/ci_source_deps.repos index b09c060..c6e4150 100644 --- a/ci_source_deps.repos +++ b/ci_source_deps.repos @@ -3,6 +3,10 @@ repositories: type: git url: https://github.com/eProsima/Fast-RTPS.git version: master + ros2/rcpputils: + type: git + url: https://github.com/ros2/rcpputils.git + version: master ros2/rmw: type: git url: https://github.com/ros2/rmw.git @@ -14,10 +18,6 @@ repositories: ros2/rmw_implementation: type: git url: https://github.com/ros2/rmw_implementation.git - ros2/rcpputils: - type: git - url: https://github.com/ros2/rcpputils.git - version: master ros2/rosidl_typesupport_fastrtps: type: git url: https://github.com/ros2/rosidl_typesupport_fastrtps.git