Merge branch 'humble' into mergify/bp/humble/pr-256

ros-controls · Sep 26, 2023 · 374233c · 374233c
2 parents 04775f8 + e1cd6f3
commit 374233c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
@@ -31,13 +31,11 @@ jobs:
  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
-<<<<<<< HEAD
-=======
  ros2_control_demo_example_10
  ros2_control_demo_example_12
->>>>>>> 60b788f ([Example 10] RRbot with GPIO interfaces (#256))
 
  vcs-repo-file-url: |
  https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_control_demos-not-released.${{ env.ROS_DISTRO }}.repos?token=${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci-ros-lint.yml b/.github/workflows/ci-ros-lint.yml
@@ -24,13 +24,11 @@ jobs:
  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
-<<<<<<< HEAD
-=======
  ros2_control_demo_example_10
  ros2_control_demo_example_12
->>>>>>> 60b788f ([Example 10] RRbot with GPIO interfaces (#256))
 
  ament_lint_100:
  name: ament_${{ matrix.linter }}
@@ -54,5 +52,8 @@ jobs:
  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