Merge branch 'humble' into mergify/bp/humble/pr-64

ros-controls · May 21, 2024 · ca35c64 · ca35c64
2 parents d56af9e + 413276a
commit ca35c64
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 20 deletions.
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -1,7 +1,9 @@
 
 ROS2 Distro | Branch | Build status | Documentation | Released packages
 :---------: | :----: | :----------: | :-----------: | :---------------:
-**Rolling** | [`rolling`](https://github.com/ros-controls/kinematics_interface/tree/rolling) | [![Rolling Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-binary-build.yml?branch=master) <br /> [![Rolling Semi-Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-semi-binary-build.yml?branch=master) <br /> [![Rolling Source Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-source-build.yml?branch=master) |  [API](http://docs.ros.org/en/rolling/p/kinematics_interface/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#rolling)
+**Rolling** | [`master`](https://github.com/ros-controls/kinematics_interface/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-binary-build.yml?branch=master) <br /> [![Rolling Semi-Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-semi-binary-build.yml?branch=master) <br /> [![Rolling Source Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-source-build.yml?branch=master) |  [API](http://docs.ros.org/en/rolling/p/kinematics_interface/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#rolling)
+**Jazzy** | [`master`](https://github.com/ros-controls/kinematics_interface/tree/master) | see above  |  [API](http://docs.ros.org/en/jazzy/p/kinematics_interface/) [API kdl](http://docs.ros.org/en/jazzy/p/kinematics_interface_kdl/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#jazzy)
+**Iron** | [`master`](https://github.com/ros-controls/kinematics_interface/tree/master) | see above  |  [API](http://docs.ros.org/en/iron/p/kinematics_interface/) [API kdl](http://docs.ros.org/en/iron/p/kinematics_interface_kdl/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#iron)
 **Humble** | [`humble`](https://github.com/ros-controls/kinematics_interface/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-binary-build.yml?branch=master) <br /> [![Humble Semi-Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-semi-binary-build.yml?branch=master) <br />  [![Humble Source Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-source-build.yml?branch=master) | [API](http://docs.ros.org/en/humble/p/kinematics_interface/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#humble)
 
 ### Explanation of different build types

diff --git a/.github/workflows/humble-coverage-build.yml b/.github/workflows/humble-coverage-build.yml
@@ -15,4 +15,3 @@ jobs:
     secrets: inherit
     with:
       ros_distro: humble
-      os_name: ubuntu-22.04
diff --git a/.github/workflows/humble-pre-commit.yml b/.github/workflows/humble-pre-commit.yml
@@ -9,10 +9,5 @@ on:
 jobs:
   pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [humble]
     with:
-      ros_distro: ${{ matrix.ROS_DISTRO }}
-      os_name: ubuntu-22.04
+      ros_distro: humble
diff --git a/.github/workflows/humble-source-build.yml b/.github/workflows/humble-source-build.yml
@@ -19,3 +19,4 @@ jobs:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: master
       ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      os_name: ubuntu-22.04
diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        ROS_DISTRO: [rolling, jazzy, iron]
     steps:
       - uses: actions/checkout@v3
       - uses: ros-industrial/industrial_ci@master

diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        ROS_DISTRO: [rolling, jazzy, iron]
         ROS_REPO: [main, testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}

diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml
@@ -15,4 +15,3 @@ jobs:
     secrets: inherit
     with:
       ros_distro: rolling
-      os_name: ubuntu-22.04
diff --git 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, iron]
+        ROS_DISTRO: [rolling, jazzy, iron]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       upstream_workspace: kinematics_interface.${{ matrix.ROS_DISTRO }}.repos

diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml
@@ -12,7 +12,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        ROS_DISTRO: [iron, jazzy, rolling]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
-      os_name: ubuntu-22.04
diff --git 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, iron]
+        ROS_DISTRO: [rolling, jazzy, iron]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       upstream_workspace: kinematics_interface.${{ matrix.ROS_DISTRO }}.repos

diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        ROS_DISTRO: [rolling, jazzy, iron]
         ROS_REPO: [main, testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}

diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml
@@ -14,8 +14,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        include:
+        - ROS_DISTRO: iron
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: jazzy
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
+        - ROS_DISTRO: rolling
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: master
       ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      os_name: ${{ matrix.OS_NAME }}
+      container: ${{ matrix.CONTAINER }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -49,7 +49,7 @@ repos:
       args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]
 
   - repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 24.4.2
     hooks:
       - id: black
         args: ["--line-length=99"]
@@ -62,7 +62,7 @@ repos:
 
   # CPP hooks
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v18.1.3
+    rev: v18.1.4
     hooks:
       - id: clang-format
         args: ['-fallback-style=none', '-i']
@@ -131,7 +131,7 @@ repos:
         exclude: CHANGELOG\.rst|\.(svg|pyc)$
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.1
+    rev: 0.28.2
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]

diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ This is a ROS 2 package for using C++ kinematics frameworks in the context of RO
 ROS2 Distro | Branch | Build status | Documentation | Released packages
 :---------: | :----: | :----------: | :-----------: | :---------------:
 **Rolling** | [`master`](https://github.com/ros-controls/kinematics_interface/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-binary-build.yml) <br /> [![Rolling Semi-Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/kinematics_interface/actions/workflows/rolling-semi-binary-build.yml) | [API](http://docs.ros.org/en/rolling/p/kinematics_interface/) [API kdl](http://docs.ros.org/en/rolling/p/kinematics_interface_kdl/) | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#rolling)
+**Jazzy** | [`master`](https://github.com/ros-controls/kinematics_interface/tree/master) | see above  |  [API](http://docs.ros.org/en/jazzy/p/kinematics_interface/) [API kdl](http://docs.ros.org/en/jazzy/p/kinematics_interface_kdl/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#jazzy)
 **Iron** | [`master`](https://github.com/ros-controls/kinematics_interface/tree/master) | see above  |  [API](http://docs.ros.org/en/iron/p/kinematics_interface/) [API kdl](http://docs.ros.org/en/iron/p/kinematics_interface_kdl/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#iron)
 **Humble** | [`humble`](https://github.com/ros-controls/kinematics_interface/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-binary-build.yml) <br /> [![Humble Semi-Binary Build](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-semi-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/kinematics_interface/actions/workflows/humble-semi-binary-build.yml) | [API](http://docs.ros.org/en/humble/p/kinematics_interface/) [API kdl](http://docs.ros.org/en/humble/p/kinematics_interface_kdl/)  | [kinematics_interface](https://index.ros.org/p/kinematics_interface/#humble)
 

diff --git a/kinematics_interface-not-released.jazzy.repos b/kinematics_interface-not-released.jazzy.repos
@@ -0,0 +1,6 @@
+repositories:
+  ## EXAMPLE DEPENDENCY
+#   <some_ros_package>:
+#     type: git
+#     url: [email protected]:<some_github_namespace>/<some_ros_package>.git
+#     version: master
diff --git a/kinematics_interface.jazzy.repos b/kinematics_interface.jazzy.repos
@@ -0,0 +1,5 @@
+repositories:
+  ros2_control:
+    type: git
+    url: https://github.com/ros-controls/ros2_control.git
+    version: master