Prepare for iron

.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: "iron"

.github/mergify.yml

@@ -0,0 +1,50 @@
+pull_request_rules:
+ - name: Backport to humble at reviewers discretion
+ conditions:
+ - base=master
+ - "label=backport-humble"
+ actions:
+ backport:
+ 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
+ - 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 @dstogl @christophfroehlich?
+
+ - name: development targets master branch
+ conditions:
+ - base!=master
+ - author!=bmagyar
+ - author!=dstogl
+ - author!=christophfroehlich
+ - 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/iron-binary-build.yml

@@ -5,10 +5,10 @@ name: Iron Binary Build
 on:
  pull_request:
  branches:
- - master
+ - iron
  push:
  branches:
- - master
+ - iron
  schedule:
  # Run every morning to detect flakiness and broken dependencies
  - cron: '03 1 * * *'

.github/workflows/iron-docker-build.yaml

@@ -4,10 +4,10 @@ name: Build Iron Dockerfile
 on:
  pull_request:
  branches:
- - master
+ - iron
  push:
  branches:
- - master
+ - iron
  schedule:
  # Run every morning to detect broken dependencies
  - cron: '50 1 * * *'

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

@@ -4,10 +4,10 @@ name: Iron Semi-Binary Build
 on:
  pull_request:
  branches:
- - master
+ - iron
  push:
  branches:
- - master
+ - iron
  schedule:
  # Run every morning to detect flakiness and broken dependencies
  - cron: '33 1 * * *'

README.md

@@ -103,10 +103,9 @@ Those two world-known imaginary robots are trivial simulations to demonstrate an
 ROS 2 Distro | Branch | Build status | Documentation
 :----------: | :----: | :----------: | :-----------:
 **Rolling** | [`master`](https://github.com/ros-controls/ros2_control_demos/tree/rolling) | [![Rolling Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml?branch=master) <br /> [![Rolling Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml?branch=master) <br /> | [Documentation](https://control.ros.org/master/index.html) <br /> [API Reference](https://control.ros.org/master/doc/api/index.html)
-**Iron** | [`master`](https://github.com/ros-controls/ros2_control_demos/tree/master) | [![Iron Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml?branch=master) <br /> [![Iron Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml?branch=master) <br /> | [Documentation](https://control.ros.org/iron/index.html) <br /> [API Reference](https://control.ros.org/iron/doc/api/index.html)
-**Humble** | [`humble`](https://github.com/ros-controls/ros2_control_demos/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml?branch=humble) <br /> [![Humble Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml?branch=humble) <br /> | [Documentation](https://control.ros.org/humble/index.html) <br /> [API Reference](https://control.ros.org/humble/doc/api/index.html)
-**Galactic** | [`galactic`](https://github.com/ros-controls/ros2_control_demos/tree/galactic) | [![Galactic Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/galactic-binary-build.yml/badge.svg?branch=galactic)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/galactic-binary-build.yml?branch=galactic) <br /> [![Galactic Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/galactic-semi-binary-build.yml/badge.svg?branch=galactic)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/galactic-semi-binary-build.yml?branch=galactic) <br /> | [Documentation](https://control.ros.org/galactic/index.html) <br /> [API Reference](https://control.ros.org/galactic/doc/api/index.html)
-**Foxy** | [`foxy`](https://github.com/ros-controls/ros2_control_demos/tree/foxy) | [![Foxy Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/foxy-binary-build.yml/badge.svg?branch=foxy)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/foxy-binary-build.yml?branch=foxy) <br /> [![Foxy Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/foxy-semi-binary-build.yml/badge.svg?branch=foxy)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/foxy-semi-binary-build.yml?branch=foxy) <br /> | [Documentation](https://control.ros.org/foxy/index.html) <br /> [API Reference](https://control.ros.org/foxy/doc/api/index.html)
+**Iron** | [`iron`](https://github.com/ros-controls/ros2_control_demos/tree/iron) | [![Iron Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml/badge.svg?branch=iron)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml?branch=iron) <br /> [![Iron Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml/badge.svg?branch=iron)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml?branch=iron) <br /> | [Documentation](https://control.ros.org/iron/index.html) <br /> [API Reference](https://control.ros.org/iron/doc/api/index.html)
+**Humble** | [`humble`](https://github.com/ros-controls/ros2_control_demos/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml?branch=humble) <br /> [![Humble Semi-Binary Build](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml/badge.svg?branch=humble)](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml?branch=humble) <br /> | [Documentation](https://control.ros.org/humble/index.html) <br />[API Reference](https://control.ros.org/humble/doc/api/index.html)
+
 
 ### Explanation of different build types
 

ros2_control_demos.iron.repos

@@ -10,12 +10,12 @@ repositories:
  ros2_control:
  type: git
  url: https://github.com/ros-controls/ros2_control.git
- version: master
+ version: iron
  ros2_controllers:
  type: git
  url: https://github.com/ros-controls/ros2_controllers.git
- version: master
+ version: iron
  gazebo_ros2_control:
  type: git
  url: https://github.com/ros-controls/gazebo_ros2_control.git
- version: master
+ version: iron