From b49057bc63c4fbde9ebd92a11aa4a8f46eb246c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 20 Nov 2024 21:12:21 +0100 Subject: [PATCH 1/3] Minor CI updates (#236) --- .github/mergify.yml | 34 ++++++++++++++++++++++++++++++++++ codecov.yml | 4 ---- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 .github/mergify.yml diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000..3c597254 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,34 @@ +pull_request_rules: + + - name: Ask to resolve conflict + conditions: + - conflict + - author!=mergify[bot] + - author!=dependabot[bot] + actions: + comment: + message: This pull request is in conflict. Could you fix it @{{author}}? + + - name: Ask to resolve conflict for backports + conditions: + - conflict + - author=mergify[bot] + actions: + comment: + message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor? + + - name: development targets master branch + conditions: + - base!=master + - author!=bmagyar + - author!=destogl + - author!=christophfroehlich + - author!=saikishor + - author!=mergify[bot] + - author!=dependabot[bot] + actions: + comment: + message: | + @{{author}}, all pull requests must be targeted towards the `master` development branch. + Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master` + to have these changes reflected into new distributions. diff --git a/codecov.yml b/codecov.yml index ac6e323a..08b92203 100644 --- a/codecov.yml +++ b/codecov.yml @@ -9,10 +9,6 @@ coverage: patch: off fixes: - "ros_ws/src/control_toolbox/::" -ignore: - - "**/test" - - "test" - - "test/**/*" comment: layout: "diff, flags, files" behavior: default From 1f1e6bcb0943d2aaebdb6d60b02323d17a8cc655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 20 Nov 2024 21:13:29 +0100 Subject: [PATCH 2/3] Minor include cleanup (#230) --- include/control_filters/low_pass_filter.hpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/control_filters/low_pass_filter.hpp b/include/control_filters/low_pass_filter.hpp index 4601076c..3eb236e1 100644 --- a/include/control_filters/low_pass_filter.hpp +++ b/include/control_filters/low_pass_filter.hpp @@ -15,11 +15,8 @@ #ifndef CONTROL_FILTERS__LOW_PASS_FILTER_HPP_ #define CONTROL_FILTERS__LOW_PASS_FILTER_HPP_ -#include -#include #include #include -#include #include "filters/filter_base.hpp" #include "geometry_msgs/msg/wrench_stamped.hpp" @@ -36,8 +33,6 @@ namespace control_filters This class implements a low-pass filter for various data types based on an Infinite Impulse Response Filter. - For vector elements, the filtering is applied separately on - each element of the vector. In particular, this class implements a simplified version of an IIR filter equation : @@ -96,7 +91,6 @@ class LowPassFilter : public filters::FilterBase bool update(const T & data_in, T & data_out) override; private: - rclcpp::Clock::SharedPtr clock_; std::shared_ptr logger_; std::shared_ptr parameter_handler_; low_pass_filter::Params parameters_; @@ -106,7 +100,6 @@ class LowPassFilter : public filters::FilterBase template bool LowPassFilter::configure() { - clock_ = std::make_shared(RCL_SYSTEM_TIME); logger_.reset( new rclcpp::Logger(this->logging_interface_->get_logger().get_child(this->filter_name_))); From 641c92954dbae1af0435cdeb105cbf5a1578d152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 20 Nov 2024 21:14:55 +0100 Subject: [PATCH 3/3] Remove iron workflows and update readme (#217) --- .github/workflows/abi-compatibility.yml | 2 +- .github/workflows/build-binary.yml | 2 +- .github/workflows/build-semi-binary.yml | 2 +- .github/workflows/build-source.yml | 3 --- .github/workflows/ci-pre-commit.yml | 2 +- .github/workflows/debian-build.yml | 2 +- .github/workflows/rhel-semi-binary-build.yml | 2 +- README.md | 1 - control_toolbox-not-released.iron.repos | 6 ------ control_toolbox.iron.repos | 9 --------- 10 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 control_toolbox-not-released.iron.repos delete mode 100644 control_toolbox.iron.repos diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index a5719664..0f969a25 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [rolling, jazzy, humble] steps: - uses: actions/checkout@v4 - uses: ros-industrial/industrial_ci@master diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml index c6df8877..c0a587a2 100644 --- a/.github/workflows/build-binary.yml +++ b/.github/workflows/build-binary.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [rolling, jazzy, humble] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/build-semi-binary.yml b/.github/workflows/build-semi-binary.yml index d4301fa1..cb2cb450 100644 --- a/.github/workflows/build-semi-binary.yml +++ b/.github/workflows/build-semi-binary.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [rolling, jazzy, humble] ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml index 7033cea8..8708039f 100644 --- a/.github/workflows/build-source.yml +++ b/.github/workflows/build-source.yml @@ -18,9 +18,6 @@ jobs: - 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 diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index 2288ed56..a355fc89 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -10,6 +10,6 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [humble, iron, jazzy, rolling] + ROS_DISTRO: [humble, jazzy, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml index c768c33d..0d3aeea4 100644 --- a/.github/workflows/debian-build.yml +++ b/.github/workflows/debian-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [rolling, jazzy, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/.github/workflows/rhel-semi-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml index ebf05edf..108980a2 100644 --- a/.github/workflows/rhel-semi-binary-build.yml +++ b/.github/workflows/rhel-semi-binary-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [rolling, jazzy, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/README.md b/README.md index 8736c6c5..ea879f75 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ 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)
[![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) **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) -**Iron** | [`ros2-master`](https://github.com/ros-controls/control_toolbox/tree/ros2-master) | see above | [API](http://docs.ros.org/en/iron/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#iron) **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) ## Publication diff --git a/control_toolbox-not-released.iron.repos b/control_toolbox-not-released.iron.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/control_toolbox-not-released.iron.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/control_toolbox.iron.repos b/control_toolbox.iron.repos deleted file mode 100644 index f8ef4ecb..00000000 --- a/control_toolbox.iron.repos +++ /dev/null @@ -1,9 +0,0 @@ -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