Merge branch 'master' into jtc-feedback-time-from-start

Author: christophfroehlich

.github/dependabot.yml

@@ -18,3 +18,17 @@ 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"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "kilted"

.github/mergify.yml

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

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

@@ -17,9 +17,9 @@ on:
       - '**.xml'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on humble branch
+  # cancel previous runs of the same workflow, except for pushes on given branches
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
 
 jobs:
   abi_check:

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

@@ -4,21 +4,7 @@ name: Humble Binary Build
 
 on:
   workflow_dispatch:
-  pull_request:
-    branches:
-      - humble
-    paths:
-      - '**.hpp'
-      - '**.h'
-      - '**.cpp'
-      - '**.py'
-      - '**.yaml'
-      - '.github/workflows/humble-binary-build.yml'
-      - '**/package.xml'
-      - '**/CMakeLists.txt'
-      - 'ros2_controllers-not-released.humble.repos'
-      - '**.xml'
-  push:
+  pull_request: &event
     branches:
       - humble
     paths:
@@ -32,14 +18,15 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.humble.repos'
       - '**.xml'
+  push: *event
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * MON-FRI'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on humble branch
+  # cancel previous runs of the same workflow, except for pushes on given branches
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
 
 jobs:
   binary:

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

@@ -1,22 +1,7 @@
 name: Coverage Build - Humble
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - humble
-    paths:
-      - '**.hpp'
-      - '**.h'
-      - '**.cpp'
-      - '**.py'
-      - '**.yaml'
-      - '.github/workflows/humble-coverage-build.yml'
-      - 'codecov.yml'
-      - '**/package.xml'
-      - '**/CMakeLists.txt'
-      - 'ros2_controllers.humble.repos'
-      - '**.xml'
-  pull_request:
+  pull_request: &event
     branches:
       - humble
     paths:
@@ -31,11 +16,12 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.humble.repos'
       - '**.xml'
+  push: *event
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on humble branch
+  # cancel previous runs of the same workflow, except for pushes on given branches
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
 
 jobs:
   coverage_humble:

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

@@ -20,9 +20,9 @@ on:
     - cron: '03 1 * * MON-FRI'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on humble branch
+  # cancel previous runs of the same workflow, except for pushes on given branches
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
 
 jobs:
   debian_semi_binary_build:

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

@@ -0,0 +1,27 @@
+name: Humble - pre-release
+# author: Christoph Froehlich <[email protected]>
+
+on:
+  workflow_dispatch:
+    inputs:
+      downstream_depth:
+        description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)'
+        required: false
+        default: 0
+        type: number
+  pull_request:
+    branches:
+      - humble
+    types:
+      - opened # default
+      - reopened # default
+      - synchronize # default
+      - labeled # also if a label changes
+
+jobs:
+  default:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
+    with:
+      ros_distro: humble
+      # downstream_depth is not set on pull_request event
+      prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}

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

@@ -20,9 +20,9 @@ on:
     - cron: '03 1 * * MON-FRI'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on humble branch
+  # cancel previous runs of the same workflow, except for pushes on given branches
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
 
 jobs:
   rhel_semi_binary_build:

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

@@ -3,21 +3,7 @@ name: Humble Semi-Binary Build
 
 on:
   workflow_dispatch:
-  pull_request:
-    branches:
-      - humble
-    paths:
-      - '**.hpp'
-      - '**.h'
-      - '**.cpp'
-      - '**.py'
-      - '**.yaml'
-      - '.github/workflows/humble-semi-binary-build.yml'
-      - '**/package.xml'
-      - '**/CMakeLists.txt'
-      - 'ros2_controllers.humble.repos'
-      - '**.xml'
-  push:
+  pull_request: &event
     branches:
       - humble
     paths:
@@ -31,14 +17,15 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.humble.repos'
       - '**.xml'
+  push: *event
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * MON-FRI'
 
 concurrency:
-  # cancel previous runs of the same workflow, except for pushes on humble branch
+  # cancel previous runs of the same workflow, except for pushes on given branches
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
 
 jobs:
   semi_binary:

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

@@ -36,15 +36,3 @@ jobs:
       # we test the downstream packages, which are part of our organization
       downstream_workspace: ros_controls.humble.repos
       not_test_downstream: false
-  build-downstream-3rd-party:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    with:
-      ros_distro: humble
-      ros_repo: testing
-      ref_for_scheduled_build: humble
-      upstream_workspace: ros2_controllers.humble.repos
-      # we don't test this repository, we just build it
-      not_test_build: true
-      # we don't test the downstream packages, which are outside of our organization
-      downstream_workspace: downstream.humble.repos
-      not_test_downstream: true