Merge branch 'master' into fix/initial_launch_cleanup

Author: christophfroehlich

.github/workflows/rolling-binary-build.yml

@@ -16,6 +16,7 @@ on:
       - '**.py'
       - '**.yaml'
       - 'ros2_control_demos-not-released.rolling.repos'
+      - 'ros2_control_demos-not-released.kilted.repos'
       - '**.xml'
   push: *event
   schedule:

.github/workflows/rolling-docker-build.yaml

@@ -2,21 +2,7 @@ name: Build Rolling Dockerfile
 # description: builds the dockerfile contained within the repo
 
 on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - '**.hpp'
-      - '**.cpp'
-      - Dockerfile/**
-      - '.github/workflows/rolling-docker-build.yml'
-      - '**/package.xml'
-      - '**/CMakeLists.txt'
-      - '**.xacro'
-      - '**.py'
-      - '**.yaml'
-      - 'ros2_control_demos.rolling.repos'
-  push:
+  pull_request: &event
     branches:
       - master
     paths:
@@ -30,6 +16,9 @@ on:
       - '**.py'
       - '**.yaml'
       - 'ros2_control_demos.rolling.repos'
+      - 'ros2_control_demos.kilted.repos'
+      - '**.xml'
+  push: *event
   schedule:
     # Run every morning to detect broken dependencies
     - cron: '50 1 * * MON-FRI'

.github/workflows/rolling-semi-binary-build.yml

@@ -15,6 +15,7 @@ on:
       - '**.py'
       - '**.yaml'
       - 'ros2_control_demos.rolling.repos'
+      - 'ros2_control_demos.kilted.repos'
       - '**.xml'
   push: *event
   schedule:

ros2_control_demos.kilted.repos

@@ -14,7 +14,7 @@ repositories:
   ros2_controllers:
     type: git
     url: https://github.com/ros-controls/ros2_controllers.git
-    version: master
+    version: kilted
   gz_ros2_control:
     type: git
     url: https://github.com/ros-controls/gz_ros2_control.git