From 79725b2a4707109f645ec40134fa0fa2c2f6e95a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 19:26:58 +0000 Subject: [PATCH] Add generate_parameter_library and RSL from source --- .github/workflows/humble-rhel-binary-build.yml | 1 + .github/workflows/iron-rhel-binary-build.yml | 1 + .github/workflows/rolling-rhel-binary-build.yml | 1 + ros2_controllers-not-released.humble.repos | 13 ++++++++----- ros2_controllers-not-released.iron.repos | 13 ++++++++----- ros2_controllers-not-released.rolling.repos | 4 ++++ ros2_controllers.rolling.repos | 4 ++++ 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index e6ed8d056d..595cad2b61 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -26,6 +26,7 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index b674805a9d..f0b269ae6d 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -27,6 +27,7 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 68a152c45f..52675477a9 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -27,6 +27,7 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/ros2_controllers-not-released.humble.repos b/ros2_controllers-not-released.humble.repos index 1b3910e7e7..408671d0af 100644 --- a/ros2_controllers-not-released.humble.repos +++ b/ros2_controllers-not-released.humble.repos @@ -1,6 +1,9 @@ repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master + generate_parameter_library: + type: git + url: https://github.com/picknikrobotics/generate_parameter_library.git + version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main diff --git a/ros2_controllers-not-released.iron.repos b/ros2_controllers-not-released.iron.repos index 1b3910e7e7..408671d0af 100644 --- a/ros2_controllers-not-released.iron.repos +++ b/ros2_controllers-not-released.iron.repos @@ -1,6 +1,9 @@ repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master + generate_parameter_library: + type: git + url: https://github.com/picknikrobotics/generate_parameter_library.git + version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main diff --git a/ros2_controllers-not-released.rolling.repos b/ros2_controllers-not-released.rolling.repos index 66352f4960..408671d0af 100644 --- a/ros2_controllers-not-released.rolling.repos +++ b/ros2_controllers-not-released.rolling.repos @@ -3,3 +3,7 @@ repositories: type: git url: https://github.com/picknikrobotics/generate_parameter_library.git version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos index 8c20eccc96..9b97953690 100644 --- a/ros2_controllers.rolling.repos +++ b/ros2_controllers.rolling.repos @@ -23,3 +23,7 @@ repositories: type: git url: https://github.com/picknikrobotics/generate_parameter_library.git version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main