Branch for Jazzy and add Kilted Kaiju

.github/dependabot.yml

@@ -18,3 +18,10 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: "humble"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "jazzy"

.github/mergify.yml

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

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

@@ -44,10 +44,9 @@ jobs:
       fail-fast: false
       matrix:
         ROS_DISTRO: [humble]
-        ROS_REPO: [testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_repo: testing
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: humble
   semi-binary-clang:

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

@@ -23,5 +23,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'
@@ -15,7 +15,7 @@ on:
       - 'ros2_control-not-released.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-binary-build.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -18,7 +18,7 @@ on:
       - 'ros2_control-not-released.jazzy.repos'
   push:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -33,7 +33,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') }}
 
@@ -49,4 +49,4 @@ jobs:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_control-not-released.${{ matrix.ROS_DISTRO }}.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,31 +1,30 @@
 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'
-  #     - '**/package.xml'
-  #     - '**/CMakeLists.txt'
-  #     - 'ros2_control.jazzy.repos'
-  #     - 'codecov.yml'
-  # pull_request:
-  #   branches:
-  #     - master
-  #   paths:
-  #     - '**.hpp'
-  #     - '**.h'
-  #     - '**.cpp'
-  #     - '.github/workflows/jazzy-coverage-build.yml'
-  #     - '**/package.xml'
-  #     - '**/CMakeLists.txt'
-  #     - 'ros2_control.jazzy.repos'
-  #     - 'codecov.yml'
+  push:
+    branches:
+      - jazzy
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '.github/workflows/jazzy-coverage-build.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_control.jazzy.repos'
+      - 'codecov.yml'
+  pull_request:
+    branches:
+      - jazzy
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '.github/workflows/jazzy-coverage-build.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_control.jazzy.repos'
+      - 'codecov.yml'
 
 jobs:
   coverage_jazzy:

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

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -18,7 +18,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') }}
 
@@ -32,5 +32,5 @@ jobs:
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       skip_packages: rqt_controller_manager

.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-binary-build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -18,7 +18,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') }}
 
@@ -32,5 +32,5 @@ jobs:
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       skip_packages: rqt_controller_manager

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

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -18,7 +18,7 @@ on:
       - 'ros2_control.jazzy.repos'
   push:
     branches:
-      - master
+      - jazzy
     paths:
       - '**.hpp'
       - '**.h'
@@ -33,30 +33,25 @@ 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') }}
 
 jobs:
   semi-binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [jazzy]
-        ROS_REPO: [testing]
     with:
-      ros_distro: ${{ matrix.ROS_DISTRO }}
-      ros_repo: ${{ matrix.ROS_REPO }}
-      upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
-      ref_for_scheduled_build: master
+      ros_distro: jazzy
+      ros_repo: testing
+      upstream_workspace: ros2_control.jazzy.repos
+      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_control.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'
@@ -28,7 +28,7 @@ jobs:
     with:
       ros_distro: jazzy
       ros_repo: testing
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       upstream_workspace: ros2_control.jazzy.repos
       # we don't test target_workspace, we just build it
       not_test_build: true
@@ -40,7 +40,7 @@ jobs:
     with:
       ros_distro: jazzy
       ros_repo: testing
-      ref_for_scheduled_build: master
+      ref_for_scheduled_build: jazzy
       upstream_workspace: ros2_control.jazzy.repos
       # we don't test target_workspace, 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'
@@ -22,6 +22,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: master
+      ref: jazzy
       container: ubuntu:24.04

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

@@ -13,6 +13,7 @@ on:
       - '**/package.xml'
       - '**/CMakeLists.txt'
       - 'ros2_control-not-released.rolling.repos'
+      - 'ros2_control-not-released.kilted.repos'
 
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
@@ -22,5 +23,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

@@ -16,6 +16,7 @@ on:
       - '**/package.xml'
       - '**/CMakeLists.txt'
       - 'ros2_control-not-released.rolling.repos'
+      - 'ros2_control-not-released.kilted.repos'
   push:
     branches:
       - master
@@ -28,6 +29,7 @@ on:
       - '**/package.xml'
       - '**/CMakeLists.txt'
       - 'ros2_control-not-released.rolling.repos'
+      - 'ros2_control-not-released.kilted.repos'
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
@@ -43,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [kilted, rolling]
         ROS_REPO: [main, testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}

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

@@ -37,13 +37,8 @@ concurrency:
 jobs:
   build-on-humble:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [humble]
-        ROS_REPO: [testing]
     with:
-      ros_distro: ${{ matrix.ROS_DISTRO }}
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_distro: humble
+      ros_repo: testing
       upstream_workspace: ros2_control.rolling.repos
       ref_for_scheduled_build: master