From b5d42db2c84c5c28489e0c0eaccb0b86b05b3df4 Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 09:14:07 +0100 Subject: [PATCH 1/8] cloning rmw repo temporary Signed-off-by: Jan Staschulat (CR/ADA1.2) --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b95c458a..abc9ed0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,12 @@ jobs: apt-get install ros-${{ matrix.ros_distribution }}-rclcpp-action apt-get install ros-${{ matrix.ros_distribution }}-mimick-vendor apt-get -y install ros-${{ matrix.ros_distribution }}-performance-test-fixture + - name: Download rmw-rolling remporary + run: | + git clone -b master https://github.com/ros2/rmw src/rmw + - name: Build rmw-rolling-temporary + run: . /opt/ros/$ROS_DISTRO/setup.sh && colcon build --symlink-install --cmake-args -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON -DCMAKE_C_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_C_OUTPUT_EXTENSION_REPLACE=ON + - uses : ros-tooling/action-ros-ci@0.2.3 with: package-name: "rclc rclc_examples rclc_lifecycle rclc_parameter" From 29eceb357367102d414a50ac587c6970b7f89a70 Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 09:24:18 +0100 Subject: [PATCH 2/8] hardcoded rolling as distribution Signed-off-by: Jan Staschulat (CR/ADA1.2) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abc9ed0b..1223f173 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: run: | git clone -b master https://github.com/ros2/rmw src/rmw - name: Build rmw-rolling-temporary - run: . /opt/ros/$ROS_DISTRO/setup.sh && colcon build --symlink-install --cmake-args -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON -DCMAKE_C_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_C_OUTPUT_EXTENSION_REPLACE=ON + run: . /opt/ros/rolling/setup.sh && colcon build --symlink-install --cmake-args -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON -DCMAKE_C_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_C_OUTPUT_EXTENSION_REPLACE=ON - uses : ros-tooling/action-ros-ci@0.2.3 with: From 6d866a2c7e1a92bba788f64ae8c713779d63b9ef Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 09:36:06 +0100 Subject: [PATCH 3/8] added rmw as dependency in package.xml Signed-off-by: Jan Staschulat (CR/ADA1.2) --- .github/workflows/ci.yml | 6 ------ rclc/package.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1223f173..b95c458a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,12 +36,6 @@ jobs: apt-get install ros-${{ matrix.ros_distribution }}-rclcpp-action apt-get install ros-${{ matrix.ros_distribution }}-mimick-vendor apt-get -y install ros-${{ matrix.ros_distribution }}-performance-test-fixture - - name: Download rmw-rolling remporary - run: | - git clone -b master https://github.com/ros2/rmw src/rmw - - name: Build rmw-rolling-temporary - run: . /opt/ros/rolling/setup.sh && colcon build --symlink-install --cmake-args -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON -DCMAKE_C_FLAGS="-ftest-coverage --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" -DCMAKE_C_OUTPUT_EXTENSION_REPLACE=ON - - uses : ros-tooling/action-ros-ci@0.2.3 with: package-name: "rclc rclc_examples rclc_lifecycle rclc_parameter" diff --git a/rclc/package.xml b/rclc/package.xml index 5a89c9a3..02ca1219 100644 --- a/rclc/package.xml +++ b/rclc/package.xml @@ -13,7 +13,7 @@ William Woodall ament_cmake_ros - + rmw rcl rcl_action rcutils From 2d80a9b7dc716307f25be47ecd67ae5274ea8fa3 Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 09:48:12 +0100 Subject: [PATCH 4/8] added rmw as exec_depend Signed-off-by: Jan Staschulat (CR/ADA1.2) --- rclc/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/rclc/package.xml b/rclc/package.xml index 02ca1219..dea79d9f 100644 --- a/rclc/package.xml +++ b/rclc/package.xml @@ -20,6 +20,7 @@ rosidl_generator_c rosidl_typesupport_c + rmw rcl rcutils rosidl_generator_c From 064ac1aa24bc516fcd5461a959de762799460c78 Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 09:57:59 +0100 Subject: [PATCH 5/8] added rmw 'package-name' Signed-off-by: Jan Staschulat (CR/ADA1.2) --- .github/workflows/ci.yml | 4 ++-- rclc/package.xml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b95c458a..29f4955c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,9 +36,9 @@ jobs: apt-get install ros-${{ matrix.ros_distribution }}-rclcpp-action apt-get install ros-${{ matrix.ros_distribution }}-mimick-vendor apt-get -y install ros-${{ matrix.ros_distribution }}-performance-test-fixture - - uses : ros-tooling/action-ros-ci@0.2.3 + - uses : ros-tooling/action-ros-ci@0.2.4 with: - package-name: "rclc rclc_examples rclc_lifecycle rclc_parameter" + package-name: "rmw rclc rclc_examples rclc_lifecycle rclc_parameter" vcs-repo-file-url: dependencies.repos target-ros2-distro: ${{ matrix.ros_distribution }} colcon-defaults: | diff --git a/rclc/package.xml b/rclc/package.xml index dea79d9f..5a89c9a3 100644 --- a/rclc/package.xml +++ b/rclc/package.xml @@ -13,14 +13,13 @@ William Woodall ament_cmake_ros - rmw + rcl rcl_action rcutils rosidl_generator_c rosidl_typesupport_c - rmw rcl rcutils rosidl_generator_c From aa8336b96ce19ee0a55f9ff900a07f71dac3e51c Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 10:06:10 +0100 Subject: [PATCH 6/8] reverted package-name commit Signed-off-by: Jan Staschulat (CR/ADA1.2) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29f4955c..f0cfec17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: apt-get -y install ros-${{ matrix.ros_distribution }}-performance-test-fixture - uses : ros-tooling/action-ros-ci@0.2.4 with: - package-name: "rmw rclc rclc_examples rclc_lifecycle rclc_parameter" + package-name: "rclc rclc_examples rclc_lifecycle rclc_parameter" vcs-repo-file-url: dependencies.repos target-ros2-distro: ${{ matrix.ros_distribution }} colcon-defaults: | From ca6d5782dcc3a141868a8e30404ad3a1f9cb3575 Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 17:23:42 +0100 Subject: [PATCH 7/8] added rmw in dependencies.repos Signed-off-by: Jan Staschulat (CR/ADA1.2) --- dependencies.repos | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies.repos b/dependencies.repos index 4e2a623b..4948fc71 100644 --- a/dependencies.repos +++ b/dependencies.repos @@ -2,3 +2,7 @@ local-name: rcl uri: https://github.com/ros2/rcl.git version: master +- git: + local-name: rmw + uri: https://github.com/ros2/rmw.git + version: master From c2c83bb0e1efcb7b84291989c4db655377da8ac7 Mon Sep 17 00:00:00 2001 From: "Jan Staschulat (CR/ADA1.2)" Date: Tue, 1 Mar 2022 17:39:45 +0100 Subject: [PATCH 8/8] added other rmw dependencies Signed-off-by: Jan Staschulat (CR/ADA1.2) --- dependencies.repos | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dependencies.repos b/dependencies.repos index 4948fc71..3866228a 100644 --- a/dependencies.repos +++ b/dependencies.repos @@ -1,8 +1,21 @@ -- git: - local-name: rcl - uri: https://github.com/ros2/rcl.git +repositories: + ros2/rcl: + type: git + url: https://github.com/ros2/rcl.git version: master -- git: - local-name: rmw - uri: https://github.com/ros2/rmw.git + ros2/rmw: + type: git + url: https://github.com/ros2/rmw.git + version: master + ros2/rmw_implementation: + type: git + url: https://github.com/ros2/rmw_implementation.git + version: master + ros2/rmw_connextdds: + type: git + url: https://github.com/ros2/rmw_connextdds.git + version: master + ros2/rmw_fastrtps: + type: git + url: https://github.com/ros2/rmw_fastrtps.git version: master