From 3c84a3fe942f1675cb9e96b4c5bd8fafe9696838 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 18 Apr 2025 13:25:33 +0000 Subject: [PATCH 1/4] Branch ros2_control for jazzy --- ros_controls.jazzy.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ros_controls.jazzy.repos b/ros_controls.jazzy.repos index 1ce0e4a1..e31fcfd9 100644 --- a/ros_controls.jazzy.repos +++ b/ros_controls.jazzy.repos @@ -6,8 +6,8 @@ repositories: ros-controls/ros2_control: type: git url: https://github.com/ros-controls/ros2_control.git - version: master + version: jazzy ros-controls/ros2_controllers: type: git url: https://github.com/ros-controls/ros2_controllers.git - version: master + version: jazzy From 0fbb60cb8b8d1c2925a60e3a3885e267b167e74a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 18 Apr 2025 13:25:49 +0000 Subject: [PATCH 2/4] Update README --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 35932a43..b827c82d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -control_toolbox -=========== +# control_toolbox + [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![codecov](https://codecov.io/gh/ros-controls/control_toolbox/graph/badge.svg?token=0o4dFzADHj)](https://codecov.io/gh/ros-controls/control_toolbox) @@ -9,15 +9,19 @@ This package contains several C++ classes and filter plugins useful in writing c See the documentation of [ros2_control](http://control.ros.org) and release infos on [index.ros.org](http://index.ros.org/p/control_toolbox). ## Contributing + As an open-source project, we welcome each contributor, regardless of their background and experience. Pick a [PR](https://github.com/ros-controls/control_toolbox/pulls) and review it, or [create your own](https://github.com/ros-controls/control_toolbox/contribute)! If you are new to the project, please read the [contributing guide](https://control.ros.org/rolling/doc/contributing/contributing.html) for more information on how to get started. We are happy to help you with your first contribution. ## Build status + ROS2 Distro | Branch | Build status | Documentation | Package build :---------: | :----: | :----------: | :-----------: | :---------------: **Rolling** | [`ros2-master`](https://github.com/ros-controls/control_toolbox/tree/ros2-master) | [![Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/rolling-build-binary.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/rolling-build-binary.yml?branch=ros2-master)
[![Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/rolling-build-source.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/rolling-build-source.yml?branch=ros2-master)
[![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Rdev__control_toolbox__ubuntu_noble_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Rdev__control_toolbox__ubuntu_noble_amd64/) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [![Build Status](https://build.ros2.org/buildStatus/icon?job=Rbin_uN64__realtime_tools__ubuntu_noble_amd64__binary)](https://build.ros2.org/job/Rbin_uN64__realtime_tools__ubuntu_noble_amd64__binary/) +**Kilted** | [`ros2-master`](https://github.com/ros-controls/control_toolbox/tree/ros2-master) | see above
[![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Kdev__control_toolbox__ubuntu_noble_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Kdev__control_toolbox__ubuntu_noble_amd64/) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [![Build Status](https://build.ros2.org/buildStatus/icon?job=Kbin_uN64__realtime_tools__ubuntu_noble_amd64__binary)](https://build.ros2.org/job/Kbin_uN64__realtime_tools__ubuntu_noble_amd64__binary/) **Jazzy** | [`jazzy`](https://github.com/ros-controls/control_toolbox/tree/jazzy) | [![Jazzy Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/jazzy-build-binary.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/jazzy-build-binary.yml?branch=ros2-master)
[![Jazzy Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/jazzy-build-source.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/jazzy-build-source.yml?branch=ros2-master)
[![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Jdev__control_toolbox__ubuntu_noble_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Jdev__control_toolbox__ubuntu_noble_amd64/) | [API](http://docs.ros.org/en/jazzy/p/control_toolbox/) | [![Build Status](https://build.ros2.org/buildStatus/icon?job=Jbin_uN64__realtime_tools__ubuntu_noble_amd64__binary)](https://build.ros2.org/job/Jbin_uN64__realtime_tools__ubuntu_noble_amd64__binary/) **Humble** | [`humble`](https://github.com/ros-controls/control_toolbox/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/humble-build-binary.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/humble-build-binary.yml?branch=ros2-master)
[![Humble Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/humble-build-source.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/humble-build-source.yml?branch=ros2-master)
[![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Hdev__control_toolbox__ubuntu_jammy_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Hdev__control_toolbox__ubuntu_jammy_amd64/) | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [![Build Status](https://build.ros2.org/buildStatus/icon?job=Hbin_uJ64__realtime_tools__ubuntu_jammy_amd64__binary)](https://build.ros2.org/job/Hbin_uJ64__realtime_tools__ubuntu_jammy_amd64__binary/) ## Acknowledgements + The project has received major contributions from companies and institutions [listed on control.ros.org](https://control.ros.org/rolling/doc/acknowledgements/acknowledgements.html) From 0400b9e58878d8f15f6d98b50c37ffd777c6f261 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 18 Apr 2025 13:27:28 +0000 Subject: [PATCH 3/4] Update workflows --- .github/workflows/rolling-abi-compatibility.yml | 2 +- .github/workflows/rolling-build-binary.yml | 2 +- .github/workflows/rolling-build-downstream.yml | 2 +- .github/workflows/rolling-build-semi-binary.yml | 2 +- .github/workflows/rolling-build-source.yml | 3 +++ .github/workflows/rolling-ci-pre-commit.yml | 2 +- .github/workflows/rolling-debian-build.yml | 2 +- .../workflows/rolling-rhel-semi-binary-build.yml | 2 +- control_toolbox-not-released.kilted.repos | 6 ++++++ control_toolbox.kilted.repos | 13 +++++++++++++ ros_controls.kilted.repos | 13 +++++++++++++ 11 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 control_toolbox-not-released.kilted.repos create mode 100644 control_toolbox.kilted.repos create mode 100644 ros_controls.kilted.repos diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml index 7f906cc7..1aa49172 100644 --- a/.github/workflows/rolling-abi-compatibility.yml +++ b/.github/workflows/rolling-abi-compatibility.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-build-binary.yml b/.github/workflows/rolling-build-binary.yml index c924ffeb..f1fabf2e 100644 --- a/.github/workflows/rolling-build-binary.yml +++ b/.github/workflows/rolling-build-binary.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-build-downstream.yml b/.github/workflows/rolling-build-downstream.yml index 349562fe..6f8378cd 100644 --- a/.github/workflows/rolling-build-downstream.yml +++ b/.github/workflows/rolling-build-downstream.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-build-semi-binary.yml b/.github/workflows/rolling-build-semi-binary.yml index 503bc6d8..5d97666b 100644 --- a/.github/workflows/rolling-build-semi-binary.yml +++ b/.github/workflows/rolling-build-semi-binary.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-build-source.yml b/.github/workflows/rolling-build-source.yml index a3d92fbf..5f87e971 100644 --- a/.github/workflows/rolling-build-source.yml +++ b/.github/workflows/rolling-build-source.yml @@ -18,6 +18,9 @@ jobs: - ROS_DISTRO: rolling CONTAINER: ubuntu:24.04 OS_NAME: ubuntu-latest + - ROS_DISTRO: kilted + CONTAINER: ubuntu:24.04 + OS_NAME: ubuntu-latest with: ros_distro: ${{ matrix.ROS_DISTRO }} ref: ros2-master diff --git a/.github/workflows/rolling-ci-pre-commit.yml b/.github/workflows/rolling-ci-pre-commit.yml index 18e9a51c..72de6eac 100644 --- a/.github/workflows/rolling-ci-pre-commit.yml +++ b/.github/workflows/rolling-ci-pre-commit.yml @@ -12,6 +12,6 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml index 85fb4e76..e214fabb 100644 --- a/.github/workflows/rolling-debian-build.yml +++ b/.github/workflows/rolling-debian-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml index 4ed7d398..e961b9bc 100644 --- a/.github/workflows/rolling-rhel-semi-binary-build.yml +++ b/.github/workflows/rolling-rhel-semi-binary-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [kilted, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/control_toolbox-not-released.kilted.repos b/control_toolbox-not-released.kilted.repos new file mode 100644 index 00000000..1b3910e7 --- /dev/null +++ b/control_toolbox-not-released.kilted.repos @@ -0,0 +1,6 @@ +repositories: + ## EXAMPLE DEPENDENCY +# : +# type: git +# url: git@github.com:/.git +# version: master diff --git a/control_toolbox.kilted.repos b/control_toolbox.kilted.repos new file mode 100644 index 00000000..976d7bab --- /dev/null +++ b/control_toolbox.kilted.repos @@ -0,0 +1,13 @@ +repositories: + control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs.git + version: master + realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools + version: master + ros2_control_cmake: + type: git + url: https://github.com/ros-controls/ros2_control_cmake.git + version: master diff --git a/ros_controls.kilted.repos b/ros_controls.kilted.repos new file mode 100644 index 00000000..570d9cd0 --- /dev/null +++ b/ros_controls.kilted.repos @@ -0,0 +1,13 @@ +repositories: + ros-controls/kinematics_interface: + type: git + url: https://github.com/ros-controls/kinematics_interface.git + version: master + ros-controls/ros2_control: + type: git + url: https://github.com/ros-controls/ros2_control.git + version: master + ros-controls/ros2_controllers: + type: git + url: https://github.com/ros-controls/ros2_controllers.git + version: master From 9395cbb4cea5b0651f909fd7d3863e376848bcc7 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 18 Apr 2025 14:11:00 +0000 Subject: [PATCH 4/4] Cleanup workflows --- .github/workflows/humble-build-source.yml | 1 - .github/workflows/jazzy-build-source.yml | 1 - .github/workflows/rolling-build-downstream.yml | 3 +-- .github/workflows/rolling-build-semi-binary.yml | 3 +-- .github/workflows/rolling-build-source.yml | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/humble-build-source.yml b/.github/workflows/humble-build-source.yml index 447cce9b..43a5c22b 100644 --- a/.github/workflows/humble-build-source.yml +++ b/.github/workflows/humble-build-source.yml @@ -14,6 +14,5 @@ jobs: with: ros_distro: humble ref: humble - ros2_repo_branch: humble os_name: ubuntu-22.04 container: "" diff --git a/.github/workflows/jazzy-build-source.yml b/.github/workflows/jazzy-build-source.yml index ba1b3941..63e9a3c8 100644 --- a/.github/workflows/jazzy-build-source.yml +++ b/.github/workflows/jazzy-build-source.yml @@ -14,6 +14,5 @@ jobs: with: ros_distro: jazzy ref: jazzy - ros2_repo_branch: jazzy os_name: ubuntu-latest container: ubuntu:24.04 diff --git a/.github/workflows/rolling-build-downstream.yml b/.github/workflows/rolling-build-downstream.yml index 6f8378cd..a5b747ab 100644 --- a/.github/workflows/rolling-build-downstream.yml +++ b/.github/workflows/rolling-build-downstream.yml @@ -18,10 +18,9 @@ jobs: fail-fast: false matrix: ROS_DISTRO: [kilted, rolling] - ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} + ros_repo: testing ref_for_scheduled_build: ros2-master not_test_build: true upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/.github/workflows/rolling-build-semi-binary.yml b/.github/workflows/rolling-build-semi-binary.yml index 5d97666b..3b8e2134 100644 --- a/.github/workflows/rolling-build-semi-binary.yml +++ b/.github/workflows/rolling-build-semi-binary.yml @@ -21,9 +21,8 @@ jobs: fail-fast: false matrix: ROS_DISTRO: [kilted, rolling] - ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} + ros_repo: testing upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos ref_for_scheduled_build: ros2-master diff --git a/.github/workflows/rolling-build-source.yml b/.github/workflows/rolling-build-source.yml index 5f87e971..65fcf1fc 100644 --- a/.github/workflows/rolling-build-source.yml +++ b/.github/workflows/rolling-build-source.yml @@ -24,6 +24,5 @@ jobs: with: ros_distro: ${{ matrix.ROS_DISTRO }} ref: ros2-master - ros2_repo_branch: ${{ matrix.ROS_DISTRO }} os_name: ${{ matrix.OS_NAME }} container: ${{ matrix.CONTAINER }}