Skip to content

Commit 044db05

Browse files
[CI] Use a single list for lint job (ros-controls#451)
* Use a single list for lint job * Add explicit keyword * Update broken links
1 parent edb011a commit 044db05

File tree

3 files changed

+21
-29
lines changed

3 files changed

+21
-29
lines changed

.github/workflows/ci-ros-lint.yml

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@ name: ROS Lint
22
on:
33
pull_request:
44

5+
env:
6+
package-name:
7+
ros2_control_demo_example_1
8+
ros2_control_demo_example_2
9+
ros2_control_demo_example_3
10+
ros2_control_demo_example_4
11+
ros2_control_demo_example_5
12+
ros2_control_demo_example_6
13+
ros2_control_demo_example_7
14+
ros2_control_demo_example_8
15+
ros2_control_demo_example_9
16+
ros2_control_demo_example_10
17+
ros2_control_demo_example_11
18+
ros2_control_demo_example_12
19+
ros2_control_demo_example_14
20+
521
jobs:
622
ament_lint:
723
name: ament_${{ matrix.linter }}
@@ -19,20 +35,7 @@ jobs:
1935
with:
2036
distribution: rolling
2137
linter: ${{ matrix.linter }}
22-
package-name:
23-
ros2_control_demo_example_1
24-
ros2_control_demo_example_2
25-
ros2_control_demo_example_3
26-
ros2_control_demo_example_4
27-
ros2_control_demo_example_5
28-
ros2_control_demo_example_6
29-
ros2_control_demo_example_7
30-
ros2_control_demo_example_8
31-
ros2_control_demo_example_9
32-
ros2_control_demo_example_10
33-
ros2_control_demo_example_11
34-
ros2_control_demo_example_12
35-
ros2_control_demo_example_14
38+
package-name: ${{ env.package-name }}
3639

3740
ament_lint_100:
3841
name: ament_${{ matrix.linter }}
@@ -49,15 +52,4 @@ jobs:
4952
distribution: rolling
5053
linter: cpplint
5154
arguments: "--linelength=100 --filter=-whitespace/newline"
52-
package-name:
53-
ros2_control_demo_example_1
54-
ros2_control_demo_example_2
55-
ros2_control_demo_example_3
56-
ros2_control_demo_example_4
57-
ros2_control_demo_example_5
58-
ros2_control_demo_example_6
59-
ros2_control_demo_example_7
60-
ros2_control_demo_example_8
61-
ros2_control_demo_example_9
62-
ros2_control_demo_example_12
63-
ros2_control_demo_example_14
55+
package-name: ${{ env.package-name }}

example_11/doc/userdoc.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ Files used for this demos
121121
* Controllers yaml: `carlikebot_controllers.yaml <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/bringup/config/carlikebot_controllers.yaml>`__
122122
* URDF file: `carlikebot.urdf.xacro <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/urdf/carlikebot.urdf.xacro>`__
123123

124-
* 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>`__
124+
* Description: `carlikebot.urdf.xacro <https://github.com/ros-controls/ros2_control_demos/tree/{REPOS_FILE_BRANCH}/example_11/description/urdf/carlikebot.urdf.xacro>`__
125125
* ``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>`__
126126

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

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

example_11/hardware/include/ros2_control_demo_example_11/carlikebot_system.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct JointValue
4545

4646
struct Joint
4747
{
48-
Joint(const std::string & name) : joint_name(name)
48+
explicit Joint(const std::string & name) : joint_name(name)
4949
{
5050
state = JointValue();
5151
command = JointValue();

0 commit comments

Comments
 (0)