From e305fa91ec6037b6270a2e7f4ea35af5c691bde0 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 22:01:30 +0000 Subject: [PATCH 1/4] Add jazzy workflows --- .github/workflows/rolling-binary-build.yml | 2 +- .github/workflows/rolling-docker-build.yaml | 6 +++++- .github/workflows/rolling-pre-commit.yml | 6 +++++- .github/workflows/rolling-semi-binary-build.yml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml index 6ee9eb36..09bcc02b 100644 --- a/.github/workflows/rolling-binary-build.yml +++ b/.github/workflows/rolling-binary-build.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [rolling, jazzy] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-docker-build.yaml b/.github/workflows/rolling-docker-build.yaml index 02e234a6..bd056a7a 100644 --- a/.github/workflows/rolling-docker-build.yaml +++ b/.github/workflows/rolling-docker-build.yaml @@ -16,9 +16,13 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling, jazzy] steps: - uses: actions/checkout@v4 with: ref: master - name: Build the Docker image - run: docker build --file Dockerfile/Dockerfile --tag ros2_control_demos_rolling --build-arg ROS_DISTRO=rolling . + run: docker build --file Dockerfile/Dockerfile --tag ros2_control_demos_${{ matrix.ROS_DISTRO }} --build-arg ROS_DISTRO=${{ matrix.ROS_DISTRO }} . diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml index 4d91d191..53fc7a6d 100644 --- a/.github/workflows/rolling-pre-commit.yml +++ b/.github/workflows/rolling-pre-commit.yml @@ -9,6 +9,10 @@ on: jobs: pre-commit: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling, jazzy] with: - ros_distro: rolling + ros_distro: ${{ matrix.ROS_DISTRO }} container: ubuntu:24.04 diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml index 737f35e9..6277fe6d 100644 --- a/.github/workflows/rolling-semi-binary-build.yml +++ b/.github/workflows/rolling-semi-binary-build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling] + ROS_DISTRO: [rolling, jazzy] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} From 11e214a25f9aa2d54329c9634c7b1c1f13e1fcad Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 22:02:52 +0000 Subject: [PATCH 2/4] Update readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62ce88a8..513b2fc5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ros2_control Demos -[![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) This repository provides examples for functionalities and capabilities of `ros2_control` framework. It consists of simple implementations that demonstrate different concepts. Choose the right branch of this repository matching you ROS 2 distribution as well as the full documentation on [control.ros.org](https://control.ros.org), see [this table](#build-status). @@ -102,7 +102,8 @@ Those two world-known imaginary robots are trivial simulations to demonstrate an ROS 2 Distro | Branch | Build status | Documentation :----------: | :----: | :----------: | :-----------: -**Rolling** | [`master`](https://github.com/ros-controls/ros2_control_demos/tree/rolling) | [![Rolling Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml?branch=master)
[![Rolling Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml?branch=master)
| [Documentation](https://control.ros.org/master/index.html)
[API Reference](https://control.ros.org/master/doc/api/index.html) +**Rolling** | [`master`](https://github.com/ros-controls/ros2_control_demos/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml?branch=master)
[![Rolling Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml?branch=master)
| [Documentation](https://control.ros.org/master/index.html)
[API Reference](https://control.ros.org/master/doc/api/index.html) +**Jazzy** | [`master`](https://github.com/ros-controls/ros2_control_demos/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml?branch=master)
[![Rolling Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml?branch=master)
| [Documentation](https://control.ros.org/master/index.html)
[API Reference](https://control.ros.org/jazzy/doc/api/index.html) **Iron** | [`iron`](https://github.com/ros-controls/ros2_control_demos/tree/iron) | [![Iron Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml/badge.svg?branch=iron)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml?branch=iron)
[![Iron Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml/badge.svg?branch=iron)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml?branch=iron)
| [Documentation](https://control.ros.org/iron/index.html)
[API Reference](https://control.ros.org/iron/doc/api/index.html) **Humble** | [`humble`](https://github.com/ros-controls/ros2_control_demos/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml?branch=humble)
[![Humble Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml?branch=humble)
| [Documentation](https://control.ros.org/humble/index.html)
[API Reference](https://control.ros.org/humble/doc/api/index.html) From e65c9ca5b543da56f1b85c00df52a0feddbf87ab Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 7 May 2024 20:09:54 +0000 Subject: [PATCH 3/4] Update upstream pre-commit wf --- .github/workflows/humble-pre-commit.yml | 1 - .github/workflows/iron-pre-commit.yml | 1 - .github/workflows/rolling-pre-commit.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/humble-pre-commit.yml b/.github/workflows/humble-pre-commit.yml index be8c84b0..5bb24085 100644 --- a/.github/workflows/humble-pre-commit.yml +++ b/.github/workflows/humble-pre-commit.yml @@ -11,4 +11,3 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master with: ros_distro: humble - os_name: ubuntu-22.04 diff --git a/.github/workflows/iron-pre-commit.yml b/.github/workflows/iron-pre-commit.yml index 60ad26d0..a1289580 100644 --- a/.github/workflows/iron-pre-commit.yml +++ b/.github/workflows/iron-pre-commit.yml @@ -11,4 +11,3 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master with: ros_distro: iron - os_name: ubuntu-22.04 diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml index 53fc7a6d..aba2208f 100644 --- a/.github/workflows/rolling-pre-commit.yml +++ b/.github/workflows/rolling-pre-commit.yml @@ -15,4 +15,3 @@ jobs: ROS_DISTRO: [rolling, jazzy] with: ros_distro: ${{ matrix.ROS_DISTRO }} - container: ubuntu:24.04 From 0ce1cd10976486045db894203fa0cfbedc0790c7 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 8 May 2024 11:01:49 +0000 Subject: [PATCH 4/4] Add missing repos files --- ros2_control_demos-not-released.jazzy.repos | 1 + ros2_control_demos.jazzy.repos | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 ros2_control_demos-not-released.jazzy.repos create mode 100644 ros2_control_demos.jazzy.repos diff --git a/ros2_control_demos-not-released.jazzy.repos b/ros2_control_demos-not-released.jazzy.repos new file mode 100644 index 00000000..56f46b6f --- /dev/null +++ b/ros2_control_demos-not-released.jazzy.repos @@ -0,0 +1 @@ +repositories: diff --git a/ros2_control_demos.jazzy.repos b/ros2_control_demos.jazzy.repos new file mode 100644 index 00000000..e2024e5e --- /dev/null +++ b/ros2_control_demos.jazzy.repos @@ -0,0 +1,21 @@ +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.git + version: master + ros2_control: + type: git + url: https://github.com/ros-controls/ros2_control.git + version: master + ros2_controllers: + type: git + url: https://github.com/ros-controls/ros2_controllers.git + version: master + gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: master