Add Kilted Kaiju

.github/mergify.yml

@@ -8,6 +8,15 @@ pull_request_rules:
         branches:
           - humble
 
+  - name: Backport to jazzy at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-jazzy"
+    actions:
+      backport:
+        branches:
+          - jazzy
+
   - name: Ask to resolve conflict
     conditions:
       - conflict

.github/workflows/humble-source-build.yml

@@ -25,5 +25,4 @@ jobs:
     with:
       ros_distro: humble
       ref: humble
-      ros2_repo_branch: humble
       os_name: ubuntu-22.04

.github/workflows/jazzy-abi-compatibility.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -16,7 +16,7 @@ on:
       - '**.xml'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on master branch
+  # cancel previous runs of the same workflow, except for pushes on jazzy branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 

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

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
       - '*feature*'
       - '*feature/**'
     paths:
@@ -22,7 +22,7 @@ on:
       - '**.xml'
   push:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -38,7 +38,7 @@ on:
     - cron: '03 1 * * *'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on master branch
+  # cancel previous runs of the same workflow, except for pushes on jazzy branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
@@ -53,4 +53,4 @@ jobs:
       ros_distro: jazzy
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.jazzy.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy

.github/workflows/jazzy-check-docs.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.rst'
       - '**.md'

.github/workflows/jazzy-coverage-build.yml

@@ -1,40 +1,39 @@
 name: Coverage Build - Jazzy
 on:
   workflow_dispatch:
-  # TODO(anyone) activate when branched for Jazzy
-  # push:
-  #   branches:
-  #     - master
-  #   paths:
-  #     - '**.hpp'
-  #     - '**.h'
-  #     - '**.cpp'
-  #     - '.github/workflows/jazzy-coverage-build.yml'
-  #     - '**.yaml'
-  #     - '**/package.xml'
-  #     - '**/CMakeLists.txt'
-  #     - 'codecov.yml'
-  #     - '**/package.xml'
-  #     - '**/CMakeLists.txt'
-  #     - 'ros2_controllers.jazzy.repos'
-  # pull_request:
-  #   branches:
-  #     - master
-  #   paths:
-  #     - '**.hpp'
-  #     - '**.h'
-  #     - '**.cpp'
-  #     - '.github/workflows/jazzy-coverage-build.yml'
-  #     - '**.yaml'
-  #     - '**/package.xml'
-  #     - '**/CMakeLists.txt'
-  #     - 'codecov.yml'
-  #     - '**/package.xml'
-  #     - '**/CMakeLists.txt'
-  #     - 'ros2_controllers.jazzy.repos'
+  push:
+    branches:
+      - jazzy
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '.github/workflows/jazzy-coverage-build.yml'
+      - '**.yaml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'codecov.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_controllers.jazzy.repos'
+  pull_request:
+    branches:
+      - jazzy
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '.github/workflows/jazzy-coverage-build.yml'
+      - '**.yaml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'codecov.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_controllers.jazzy.repos'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on master branch
+  # cancel previous runs of the same workflow, except for pushes on jazzy branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 

.github/workflows/jazzy-debian-build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -20,7 +20,7 @@ on:
     - cron: '03 1 * * *'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on master branch
+  # cancel previous runs of the same workflow, except for pushes on jazzy branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
@@ -31,5 +31,5 @@ jobs:
     with:
       ros_distro: jazzy
       upstream_workspace: ros2_controllers.jazzy.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       skip_packages: rqt_joint_trajectory_controller

.github/workflows/jazzy-pre-commit.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/jazzy-rhel-semi-binary-build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -20,7 +20,7 @@ on:
     - cron: '03 1 * * *'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on master branch
+  # cancel previous runs of the same workflow, except for pushes on jazzy branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
@@ -30,5 +30,5 @@ jobs:
     with:
       ros_distro: jazzy
       upstream_workspace: ros2_controllers.jazzy.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       skip_packages: rqt_joint_trajectory_controller

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

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
       - '*feature*'
       - '*feature/**'
     paths:
@@ -21,7 +21,7 @@ on:
       - '**.xml'
   push:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -38,7 +38,7 @@ on:
     - cron: '33 1 * * *'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on master branch
+  # cancel previous runs of the same workflow, except for pushes on jazzy branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
@@ -49,14 +49,14 @@ jobs:
       ros_distro: jazzy
       ros_repo: testing
       upstream_workspace: ros2_controllers.jazzy.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
   semi_binary_clang:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
     with:
       ros_distro: jazzy
       ros_repo: testing
       upstream_workspace: ros2_controllers.jazzy.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       additional_debs: clang
       c_compiler: clang
       cxx_compiler: clang++

.github/workflows/jazzy-semi-binary-downstream-build.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -29,7 +29,7 @@ jobs:
     with:
       ros_distro: jazzy
       ros_repo: testing
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       upstream_workspace: ros2_controllers.jazzy.repos
       # we don't test this repository, we just build it
       not_test_build: true
@@ -41,7 +41,7 @@ jobs:
     with:
       ros_distro: jazzy
       ros_repo: testing
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       upstream_workspace: ros2_controllers.jazzy.repos
       # we don't test this repository, we just build it
       not_test_build: true

.github/workflows/jazzy-source-build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -24,6 +24,5 @@ jobs:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
     with:
       ros_distro: jazzy
-      ref: master
-      ros2_repo_branch: jazzy
+      ref: jazzy
       container: ubuntu:24.04

.github/workflows/rolling-abi-compatibility.yml

@@ -13,6 +13,7 @@ on:
       - '**/package.xml'
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.rolling.repos'
+      - 'ros2_controllers-not-released.kilted.repos'
       - '**.xml'
 
 concurrency:
@@ -23,5 +24,9 @@ concurrency:
 jobs:
   abi_check:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        ROS_DISTRO: [kilted, rolling]
     with:
-      ros_distro: rolling
+      ros_distro: ${{ matrix.ROS_DISTRO }}

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

@@ -19,6 +19,7 @@ on:
       - '**/package.xml'
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.rolling.repos'
+      - 'ros2_controllers-not-released.kilted.repos'
       - '**.xml'
   push:
     branches:
@@ -33,6 +34,7 @@ on:
       - '**/package.xml'
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.rolling.repos'
+      - 'ros2_controllers-not-released.kilted.repos'
       - '**.xml'
   schedule:
     # Run every morning to detect flakiness and broken dependencies
@@ -49,9 +51,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        ROS_DISTRO: [kilted, rolling]
         ROS_REPO: [main, testing]
     with:
-      ros_distro: rolling
+      ros_distro: ${{ matrix.ROS_DISTRO }}
       ros_repo: ${{ matrix.ROS_REPO }}
-      upstream_workspace: ros2_controllers-not-released.rolling.repos
+      upstream_workspace: ros2_controllers-not-released.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master

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

@@ -0,0 +1,50 @@
+name: Check Rolling Compatibility on Kilted
+# author: Christoph Froehlich <[email protected]>
+# description: 'Build & test the rolling version on Kilted distro.'
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - master
+      - '*feature*'
+      - '*feature/**'
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '**.py'
+      - '**.yaml'
+      - '.github/workflows/rolling-compatibility-kilted-binary-build.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_controllers.rolling.repos'
+      - '**.xml'
+  push:
+    branches:
+      - master
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '**.py'
+      - '**.yaml'
+      - '.github/workflows/rolling-compatibility-kilted-binary-build.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_controllers.rolling.repos'
+      - '**.xml'
+
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+
+jobs:
+  build-on-kilted:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: kilted
+      ros_repo: testing
+      upstream_workspace: ros2_controllers.rolling.repos
+      ref_for_scheduled_build: master