Skip to content

Commit

Permalink
Merge branch 'ros2-master' into add-saving-i-term
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Nov 4, 2024
2 parents df75c12 + af713c0 commit 7a6fc9e
Show file tree
Hide file tree
Showing 20 changed files with 402 additions and 53 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/abi-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: ABI Compatibility Check
on:
workflow_dispatch:
pull_request:
branches:
- ros2-master

jobs:
abi_check:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, iron, humble]
steps:
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
ROS_REPO: main
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
NOT_TEST_BUILD: true
2 changes: 1 addition & 1 deletion .github/workflows/build-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
ROS_DISTRO: [rolling, jazzy, iron, humble]
ROS_REPO: [main, testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/build-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,22 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
include:
- ROS_DISTRO: humble
CONTAINER: ""
OS_NAME: ubuntu-22.04
- 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: ros2-master
ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
os_name: ${{ matrix.OS_NAME }}
container: ${{ matrix.CONTAINER }}
2 changes: 1 addition & 1 deletion .github/workflows/ci-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
ROS_DISTRO: [humble, iron, jazzy, rolling]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
2 changes: 1 addition & 1 deletion .github/workflows/debian-build.yml
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, iron, humble]
ROS_DISTRO: [rolling, jazzy, iron, humble]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rhel-semi-binary-build.yml
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, iron, humble]
ROS_DISTRO: [rolling, jazzy, iron, humble]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/rosdoc2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: rosdoc2

on:
workflow_dispatch:
pull_request:
paths:
- doc/**
- rosdoc2.yaml
- package.xml


jobs:
check:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rosdoc2.yml@master
2 changes: 1 addition & 1 deletion .github/workflows/update-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Auto Update pre-commit
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0' # Run every Sunday at midnight
- cron: '0 0 1 * *' # Runs at 00:00, on day 1 of the month

jobs:
auto_update_and_create_pr:
Expand Down
17 changes: 9 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
repos:
# Standard hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -36,7 +36,7 @@ repos:

# Python hooks
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.2
rev: v3.19.0
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand All @@ -49,20 +49,20 @@ 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.10.0
hooks:
- id: black
args: ["--line-length=99"]

- repo: https://github.com/pycqa/flake8
rev: 7.0.0
rev: 7.1.1
hooks:
- id: flake8
args: ["--extend-ignore=E501"]

# CPP hooks
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.2
rev: v19.1.3
hooks:
- id: clang-format
args: ['-fallback-style=none', '-i']
Expand Down Expand Up @@ -104,10 +104,11 @@ repos:
description: Check if copyright notice is available in all files.
entry: ament_copyright
language: system
exclude: doc/conf.py

# Docs - RestructuredText hooks
- repo: https://github.com/PyCQA/doc8
rev: v1.1.1
rev: v1.1.2
hooks:
- id: doc8
args: ['--max-line-length=100', '--ignore=D001']
Expand All @@ -124,14 +125,14 @@ repos:
# Spellcheck in comments and docs
# skipping of *.svg files is not working...
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
args: ['--write-changes']
exclude: CHANGELOG\.rst|\.(svg|pyc)$

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.0
rev: 0.29.4
hooks:
- id: check-github-workflows
args: ["--verbose"]
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Changelog for package control_toolbox
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

3.3.0 (2024-10-28)
------------------
* PID: Improve the API docs and change default value of antiwindup (`#202 <https://github.com/ros-controls/control_toolbox/issues/202>`_)
* [CI] Specify runner/container images and add Jazzy jobs (`#200 <https://github.com/ros-controls/control_toolbox/issues/200>`_)
* Add custom rosdoc2 config (`#199 <https://github.com/ros-controls/control_toolbox/issues/199>`_)
* [CI] Update pre-commit and remove ros-lint (`#187 <https://github.com/ros-controls/control_toolbox/issues/187>`_)
* Use Eigen CMake target (`#190 <https://github.com/ros-controls/control_toolbox/issues/190>`_)
* [CI] Use wf from ros2_control_ci for coverage build (`#188 <https://github.com/ros-controls/control_toolbox/issues/188>`_)
* Contributors: Christoph Fröhlich, dependabot[bot], github-actions[bot]

3.2.0 (2023-12-12)
------------------
* [CI] fix source build (`#168 <https://github.com/ros-controls/control_toolbox/issues/168>`_)
Expand Down
Loading

0 comments on commit 7a6fc9e

Please sign in to comment.