Skip to content

Commit

Permalink
[CI] Use a single list for lint job (backport #451) (#453)
Browse files Browse the repository at this point in the history
* [CI] Use a single list for lint job (#451)

* Use a single list for lint job

* Add explicit keyword

* Update broken links

(cherry picked from commit 044db05)

# Conflicts:
#	.github/workflows/ci-ros-lint.yml

* Fix merge conflict

---------

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
  • Loading branch information
3 people authored Feb 18, 2024
1 parent 70bd91a commit 4543658
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 30 deletions.
45 changes: 18 additions & 27 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@ name: ROS Lint
on:
pull_request:

env:
package-name:
ros2_control_demo_example_1
ros2_control_demo_example_2
ros2_control_demo_example_3
ros2_control_demo_example_4
ros2_control_demo_example_5
ros2_control_demo_example_6
ros2_control_demo_example_7
ros2_control_demo_example_8
ros2_control_demo_example_9
ros2_control_demo_example_10
ros2_control_demo_example_11
ros2_control_demo_example_12
ros2_control_demo_example_14

jobs:
ament_lint:
name: ament_${{ matrix.linter }}
Expand All @@ -19,20 +35,7 @@ jobs:
with:
distribution: humble
linter: ${{ matrix.linter }}
package-name:
ros2_control_demo_example_1
ros2_control_demo_example_2
ros2_control_demo_example_3
ros2_control_demo_example_4
ros2_control_demo_example_5
ros2_control_demo_example_6
ros2_control_demo_example_7
ros2_control_demo_example_8
ros2_control_demo_example_9
ros2_control_demo_example_10
ros2_control_demo_example_11
ros2_control_demo_example_12
ros2_control_demo_example_14
package-name: ${{ env.package-name }}

ament_lint_100:
name: ament_${{ matrix.linter }}
Expand All @@ -49,16 +52,4 @@ jobs:
distribution: humble
linter: cpplint
arguments: "--linelength=100 --filter=-whitespace/newline"
package-name:
ros2_control_demo_example_1
ros2_control_demo_example_2
ros2_control_demo_example_3
ros2_control_demo_example_4
ros2_control_demo_example_5
ros2_control_demo_example_6
ros2_control_demo_example_7
ros2_control_demo_example_8
ros2_control_demo_example_9
ros2_control_demo_example_10
ros2_control_demo_example_12
ros2_control_demo_example_14
package-name: ${{ env.package-name }}
4 changes: 2 additions & 2 deletions example_11/doc/userdoc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ Files used for this demos
* Controllers yaml: `carlikebot_controllers.yaml <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/bringup/config/carlikebot_controllers.yaml>`__
* URDF file: `carlikebot.urdf.xacro <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/urdf/carlikebot.urdf.xacro>`__

* Description: `carlikebot_description.urdf.xacro <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/urdf/carlikebot_description.urdf.xacro>`__
* Description: `carlikebot.urdf.xacro <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/urdf/carlikebot.urdf.xacro>`__
* ``ros2_control`` tag: `carlikebot.ros2_control.xacro <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/ros2_control/carlikebot.ros2_control.xacro>`__

* RViz configuration: `carlikebot.rviz <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/rviz/carlikebot.rviz>`__
* RViz configuration: `carlikebot.rviz <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/ros2_control_demo_description/carlikebot/rviz/carlikebot.rviz>`__

* Hardware interface plugin: `carlikebot_system.cpp <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/hardware/carlikebot_system.cpp>`__

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct JointValue

struct Joint
{
Joint(const std::string & name) : joint_name(name)
explicit Joint(const std::string & name) : joint_name(name)
{
state = JointValue();
command = JointValue();
Expand Down

0 comments on commit 4543658

Please sign in to comment.