Changes after branching humble (backport #217)

.github/dependabot.yml

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

.github/mergify.yml

@@ -0,0 +1,42 @@
+pull_request_rules:
+  - name: Backport to humble at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-humble"
+    actions:
+      backport:
+        branches:
+          - humble
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @{{author}}?
+
+  - name: Ask to resolve conflict for backports
+    conditions:
+      - conflict
+      - author=mergify[bot]
+    actions:
+        comment:
+          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:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `master` development branch.
+            Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
+            to have these changes reflected into new distributions.

.github/workflows/README.md

@@ -1,9 +1,9 @@
 ## Build status
 
-ROS2 Distro | Branch | Build status | Documentation | Released packages
+ROS 2 Distro | Branch | Build status | Documentation | Released packages
 :---------: | :----: | :----------: | :-----------: | :---------------:
-**Rolling** <br />**Jazzy**<br />**Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master) <br /> [![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling)
-
+**Rolling** <br />**Jazzy** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-binary-build.yml?branch=master) <br /> [![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling)
+**Humble** | [`humble`](https://github.com/ros-controls/realtime_tools/tree/humble) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-binary-build.yml?branch=master) <br /> [![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-source-build.yml?branch=master) | [API](http://docs.ros.org/en/humble/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#humble)
 
 
 ### Explanation of different build types

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

@@ -0,0 +1,23 @@
+name: Humble ABI Compatibility Check
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+
+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
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ros-industrial/industrial_ci@master
+        env:
+          ROS_DISTRO: humble
+          ROS_REPO: main
+          ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
+          NOT_TEST_BUILD: true

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

@@ -0,0 +1,34 @@
+name: Humble Windows Binary Build
+# author: Christoph Fröhlich <[email protected]>
+# description: 'Build & test all dependencies from released (binary) windows packages.'
+
+on:
+  workflow_dispatch:
+  # pull_request:
+  #   branches:
+  #     - humble
+  #   types:
+  #     - labeled
+  # push:
+  #   branches:
+  #     - humble
+  # issue_comment:
+  #   types:
+  #     - created
+
+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-windows:
+    # if: |
+    #   (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/check-windows')) ||
+    #   (github.event_name == 'pull_request' && contains(github.event.label.name, 'check-windows')) ||
+    #   (github.event_name == 'workflow_dispatch')
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master
+    with:
+      ros_distro: humble
+      ref_for_scheduled_build: humble
+      os_name: windows-2019

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

@@ -0,0 +1,42 @@
+name: Humble Binary Build
+# author: Denis Štogl <[email protected]>
+# description: 'Build & test all dependencies from released (binary) packages.'
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  push:
+    branches:
+      - humble
+  schedule:
+    # 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
+    strategy:
+      fail-fast: false
+      matrix:
+        ROS_REPO: [main, testing]
+    with:
+      ros_distro: humble
+      ros_repo: ${{ matrix.ROS_REPO }}
+      ref_for_scheduled_build: master
+  binary_clang:
+    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: humlbe
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true

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

@@ -0,0 +1,28 @@
+name: Humble Downstream Build
+# description: 'Build & test downstream packages from source.'
+# author: Christoph Froehlich <[email protected]>
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  push:
+    branches:
+      - humble
+
+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:
+  build-downstream:
+    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: master
+      not_test_build: true
+      downstream_workspace: ros_controls.humble.repos
+      not_test_downstream: true

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

@@ -0,0 +1,22 @@
+name: Humble Coverage Build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - humble
+  pull_request:
+    branches:
+      - humble
+
+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:
+    name: coverage build
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
+    secrets: inherit
+    with:
+      ros_distro: humble

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

@@ -0,0 +1,21 @@
+name: Humble Debian Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '33 2 * * *'
+
+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:
+  debian_source_build:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
+    with:
+      ros_distro: humble
+      ref_for_scheduled_build: humble

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

@@ -0,0 +1,17 @@
+name: Humble Pre-Commit
+
+on:
+  workflow_dispatch:
+  pull_request:
+    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
+    with:
+      ros_distro: humble

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

@@ -0,0 +1,21 @@
+name: Humble RHEL Binary Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 3 * * *'
+
+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:
+  rhel_semi_binary_build:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
+    with:
+      ros_distro: humble
+      ref_for_scheduled_build: humble

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

@@ -0,0 +1,26 @@
+name: Humble Source Build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - humble
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 3 * * *'
+
+jobs:
+  source:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - ROS_DISTRO: humble
+          CONTAINER: ""
+          OS_NAME: ubuntu-22.04
+    with:
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ref: humble
+      ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      os_name: ${{ matrix.OS_NAME }}
+      container: ${{ matrix.CONTAINER }}

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

@@ -1,17 +1,22 @@
-name: ABI Compatibility Check
+name: Rolling ABI Compatibility Check
 on:
   workflow_dispatch:
   pull_request:
     branches:
       - master
 
+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:
   abi_check:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [humble, jazzy, rolling]
+        ROS_DISTRO: [jazzy, rolling]
     steps:
       - uses: actions/checkout@v4
       - uses: ros-industrial/industrial_ci@master

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

@@ -1,4 +1,4 @@
-name: Windows Binary Build
+name: Rolling Windows Binary Build
 # author: Christoph Fröhlich <[email protected]>
 # description: 'Build & test all dependencies from released (binary) windows packages.'
 
@@ -16,6 +16,11 @@ on:
   #   types:
   #     - created
 
+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:
   binary-windows:
     # if: |

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

@@ -1,4 +1,4 @@
-name: Binary Build
+name: Rolling Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -14,13 +14,18 @@ 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 master 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
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [humble, jazzy, rolling]
+        ROS_DISTRO: [jazzy, rolling]
         ROS_REPO: [main, testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}