Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch for humble #265

Merged
merged 6 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "weekly"
target-branch: "humble"
9 changes: 9 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
pull_request_rules:

- name: Backport to humble at reviewers discretion
conditions:
- base=master
- "label=backport-humble"
actions:
backport:
branches:
- humble

- name: Ask to resolve conflict
conditions:
- conflict
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/humble-abi-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Humble - ABI Compatibility Check
on:
workflow_dispatch:
pull_request:
branches:
- humble

jobs:
abi_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: humble
ROS_REPO: testing
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
NOT_TEST_BUILD: true
35 changes: 35 additions & 0 deletions .github/workflows/humble-build-binary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: Humble - Binary Build
on:
pull_request:
branches:
- humble
push:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '28 6 * * *'


jobs:
binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: control_toolbox-not-released.humble.repos
ref_for_scheduled_build: humble
binary_clang:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: control_toolbox-not-released.humble.repos
ref_for_scheduled_build: humble
additional_debs: clang
c_compiler: clang
cxx_compiler: clang++
not_test_build: true
17 changes: 17 additions & 0 deletions .github/workflows/humble-build-coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Humble - Coverage Build
on:
workflow_dispatch:
push:
branches:
- humble
pull_request:
branches:
- humble

jobs:
coverage_humble:
name: coverage build - humble
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
secrets: inherit
with:
ros_distro: humble
23 changes: 23 additions & 0 deletions .github/workflows/humble-build-downstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: Humble - Downstream Build
on:
pull_request:
branches:
- humble
push:
branches:
- humble


jobs:
build-downstream:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
ref_for_scheduled_build: humble
not_test_build: true
downstream_workspace: ros_controls.humble.repos
not_test_downstream: true
24 changes: 24 additions & 0 deletions .github/workflows/humble-build-semi-binary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: Humble - Semi-Binary Build
on:
pull_request:
branches:
- humble
push:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '28 6 * * *'


jobs:
semi-binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: control_toolbox.humble.repos
ref_for_scheduled_build: humble
19 changes: 19 additions & 0 deletions .github/workflows/humble-build-source.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Humble - Source Build
on:
workflow_dispatch:
push:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * *'

jobs:
source_build:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
with:
ros_distro: humble
ref: humble
ros2_repo_branch: humble
os_name: ubuntu-22.04
container: ""
13 changes: 13 additions & 0 deletions .github/workflows/humble-ci-pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Humble - Pre-Commit

on:
workflow_dispatch:
pull_request:
branches:
- humble

jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
with:
ros_distro: humble
18 changes: 18 additions & 0 deletions .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Humble - Debian Source Build
on:
workflow_dispatch:
pull_request:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 5 * * *'


jobs:
debian_source_build:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: humble
upstream_workspace: control_toolbox.humble.repos
ref_for_scheduled_build: humble
18 changes: 18 additions & 0 deletions .github/workflows/humble-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Humble - RHEL Semi-Binary Build
on:
workflow_dispatch:
pull_request:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * *'


jobs:
rhel_semi_binary_build:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
with:
ros_distro: humble
upstream_workspace: control_toolbox.humble.repos
ref_for_scheduled_build: humble
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_DISTRO: [rolling, jazzy]
steps:
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
name: Binary Build
on:
pull_request:
branches:
- ros2-master
push:
branches:
- ros2-master
Expand All @@ -18,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_DISTRO: [rolling, jazzy]
ROS_REPO: [main, testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
name: Downstream Build
on:
pull_request:
branches:
- ros2-master
push:
branches:
- ros2-master
Expand All @@ -15,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_DISTRO: [rolling, jazzy]
ROS_REPO: [testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
name: Semi-Binary Build
on:
pull_request:
branches:
- ros2-master
push:
branches:
- ros2-master
Expand All @@ -18,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_DISTRO: [rolling, jazzy]
ROS_REPO: [testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ jobs:
fail-fast: false
matrix:
include:
- ROS_DISTRO: humble
CONTAINER: ""
OS_NAME: ubuntu-22.04
- ROS_DISTRO: jazzy
CONTAINER: ubuntu:24.04
OS_NAME: ubuntu-latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ name: Pre-Commit
on:
workflow_dispatch:
pull_request:
branches:
- ros2-master

jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [humble, jazzy, rolling]
ROS_DISTRO: [jazzy, rolling]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_DISTRO: [rolling, jazzy]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_DISTRO: [rolling, jazzy]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ control_toolbox
===========
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
[![Licence](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)
[![codecov](https://codecov.io/gh/ros-controls/control_toolbox/branch/humble/graph/badge.svg?token=0o4dFzADHj)](https://codecov.io/gh/ros-controls/control_toolbox/tree/humble)

This package contains several C++ classes useful in writing controllers.

Expand All @@ -11,9 +11,9 @@ See the documentation of [ros2_control](http://control.ros.org) and release info
## Build status
ROS2 Distro | Branch | Build status | Documentation | Released packages
:---------: | :----: | :----------: | :-----------: | :---------------:
**Rolling** | [`ros2-master`](https://github.com/ros-controls/control_toolbox/tree/ros2-master) | [![Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml?branch=ros2-master) <br /> [![Rolling Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml?branch=ros2-master) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling)
**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) <br /> [![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) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling)
**Jazzy** | [`ros2-master`](https://github.com/ros-controls/control_toolbox/tree/ros2-master) | see above | [API](http://docs.ros.org/en/jazzy/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#jazzy)
**Humble** | [`ros2-master`](https://github.com/ros-controls/control_toolbox/tree/ros2-master) | see above | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble)
**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) <br /> [![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) | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble)

## Publication

Expand Down
Loading