Merge branch 'master' into tf-prefix-improvments

.github/dependabot.yml

@@ -18,10 +18,3 @@ 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: "iron"

.github/mergify.yml

@@ -8,15 +8,6 @@ pull_request_rules:
         branches:
           - humble
 
-  - name: Backport to iron at reviewers discretion
-    conditions:
-      - base=master
-      - "label=backport-iron"
-    actions:
-      backport:
-        branches:
-          - iron
-
   - name: Ask to resolve conflict
     conditions:
       - conflict
@@ -32,14 +23,15 @@ pull_request_rules:
       - author=mergify[bot]
     actions:
         comment:
-          message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?
+          message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
 
   - name: development targets master branch
     conditions:
       - base!=master
       - author!=bmagyar
       - author!=destogl
       - author!=christophfroehlich
+      - author!=saikishor
       - author!=mergify[bot]
       - author!=dependabot[bot]
     actions:

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

@@ -15,6 +15,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.humble.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+
 jobs:
   abi_check:
     runs-on: ubuntu-latest

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

@@ -34,6 +34,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+
 jobs:
   binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master

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

@@ -10,6 +10,10 @@ on:
       - '**.md'
       - '**.yaml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-docs:
     name: Check Docs

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

@@ -30,6 +30,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.humble.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+
 jobs:
   coverage_humble:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master

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

@@ -18,6 +18,10 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   humble_debian:

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

@@ -6,6 +6,10 @@ on:
     branches:
       - humble
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master

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

@@ -18,6 +18,11 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+
 jobs:
   humble_rhel_binary:
     name: Humble RHEL binary build

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

@@ -33,15 +33,27 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble 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_REPO: [main, testing]
     with:
       ros_distro: humble
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_repo: testing
       upstream_workspace: ros2_controllers.humble.repos
       ref_for_scheduled_build: humble
+  semi_binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: humble
+      ros_repo: testing
+      upstream_workspace: ros2_controllers-not-released.humble.repos
+      ref_for_scheduled_build: humble
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true