diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 05a48fc6..58c6bfae 100644
--- a/.github/dependabot.yml
+++ b/.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"
diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..0a6e425a
--- /dev/null
+++ b/.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.
diff --git a/.github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build.yml
index 36a77af9..99e75bd0 100644
--- a/.github/workflows/iron-binary-build.yml
+++ b/.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 * * *'
diff --git a/.github/workflows/iron-docker-build.yaml b/.github/workflows/iron-docker-build.yaml
index 20188edc..fb95d212 100644
--- a/.github/workflows/iron-docker-build.yaml
+++ b/.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 * * *'
diff --git a/.github/workflows/iron-semi-binary-build.yml b/.github/workflows/iron-semi-binary-build.yml
index 6fdcc17b..7f7396e8 100644
--- a/.github/workflows/iron-semi-binary-build.yml
+++ b/.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 * * *'
diff --git a/.github/workflows/prerelease-check.yml b/.github/workflows/prerelease-check.yml
deleted file mode 100644
index 80947189..00000000
--- a/.github/workflows/prerelease-check.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Pre-Release Check
-
-on:
- workflow_dispatch:
- inputs:
- ros_distro:
- description: 'Chose ROS distribution'
- required: true
- default: 'rolling'
- type: choice
- options:
- - foxy
- - galactic
- - humble
- - rolling
- branch:
- description: 'Chose branch for distro'
- required: true
- default: 'master'
- type: choice
- options:
- - foxy
- - galactic
- - humble
- - master
-
-jobs:
- pre_release:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- with:
- ref: ${{ github.event.inputs.branch }}
- - name: industrial_ci
- uses: ros-industrial/industrial_ci@master
- env:
- ROS_DISTRO: ${{ github.event.inputs.ros_distro }}
- PRERELEASE: true
- BASEDIR: ${{ github.workspace }}/.work
diff --git a/README.md b/README.md
index 96995c74..62370d87 100644
--- a/README.md
+++ b/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) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-binary-build.yml?branch=master)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/rolling-semi-binary-build.yml?branch=master)
| [Documentation](https://control.ros.org/master/index.html)
[API Reference](https://control.ros.org/master/doc/api/index.html)
-**Iron** | [`master`](https://github.com/ros-controls/ros2_control_demos/tree/master) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml?branch=master)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml?branch=master)
| [Documentation](https://control.ros.org/iron/index.html)
[API Reference](https://control.ros.org/iron/doc/api/index.html)
-**Humble** | [`humble`](https://github.com/ros-controls/ros2_control_demos/tree/humble) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml?branch=humble)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml?branch=humble)
| [Documentation](https://control.ros.org/humble/index.html)
[API Reference](https://control.ros.org/humble/doc/api/index.html)
-**Galactic** | [`galactic`](https://github.com/ros-controls/ros2_control_demos/tree/galactic) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/galactic-binary-build.yml?branch=galactic)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/galactic-semi-binary-build.yml?branch=galactic)
| [Documentation](https://control.ros.org/galactic/index.html)
[API Reference](https://control.ros.org/galactic/doc/api/index.html)
-**Foxy** | [`foxy`](https://github.com/ros-controls/ros2_control_demos/tree/foxy) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/foxy-binary-build.yml?branch=foxy)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/foxy-semi-binary-build.yml?branch=foxy)
| [Documentation](https://control.ros.org/foxy/index.html)
[API Reference](https://control.ros.org/foxy/doc/api/index.html)
+**Iron** | [`iron`](https://github.com/ros-controls/ros2_control_demos/tree/iron) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-binary-build.yml?branch=iron)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/iron-semi-binary-build.yml?branch=iron)
| [Documentation](https://control.ros.org/iron/index.html)
[API Reference](https://control.ros.org/iron/doc/api/index.html)
+**Humble** | [`humble`](https://github.com/ros-controls/ros2_control_demos/tree/humble) | [](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-binary-build.yml?branch=humble)
[](https://github.com/ros-controls/ros2_control_demos/actions/workflows/humble-semi-binary-build.yml?branch=humble)
| [Documentation](https://control.ros.org/humble/index.html)
[API Reference](https://control.ros.org/humble/doc/api/index.html)
+
### Explanation of different build types
diff --git a/ros2_control_demos-not-released.foxy.repos b/ros2_control_demos-not-released.foxy.repos
deleted file mode 100644
index 56f46b6f..00000000
--- a/ros2_control_demos-not-released.foxy.repos
+++ /dev/null
@@ -1 +0,0 @@
-repositories:
diff --git a/ros2_control_demos-not-released.galactic.repos b/ros2_control_demos-not-released.galactic.repos
deleted file mode 100644
index 56f46b6f..00000000
--- a/ros2_control_demos-not-released.galactic.repos
+++ /dev/null
@@ -1 +0,0 @@
-repositories:
diff --git a/ros2_control_demos.foxy.repos b/ros2_control_demos.foxy.repos
deleted file mode 100644
index b64aedeb..00000000
--- a/ros2_control_demos.foxy.repos
+++ /dev/null
@@ -1,17 +0,0 @@
-repositories:
- control_msgs:
- type: git
- url: https://github.com/ros-controls/control_msgs.git
- version: foxy-devel
- realtime_tools:
- type: git
- url: https://github.com/ros-controls/realtime_tools.git
- version: foxy-devel
- ros2_control:
- type: git
- url: https://github.com/ros-controls/ros2_control.git
- version: foxy
- ros2_controllers:
- type: git
- url: https://github.com/ros-controls/ros2_controllers.git
- version: foxy
diff --git a/ros2_control_demos.galactic.repos b/ros2_control_demos.galactic.repos
deleted file mode 100644
index 79f5e99d..00000000
--- a/ros2_control_demos.galactic.repos
+++ /dev/null
@@ -1,17 +0,0 @@
-repositories:
- control_msgs:
- type: git
- url: https://github.com/ros-controls/control_msgs.git
- version: galactic-devel
- realtime_tools:
- type: git
- url: https://github.com/ros-controls/realtime_tools.git
- version: foxy-devel
- ros2_control:
- type: git
- url: https://github.com/ros-controls/ros2_control.git
- version: galactic
- ros2_controllers:
- type: git
- url: https://github.com/ros-controls/ros2_controllers.git
- version: galactic
diff --git a/ros2_control_demos.iron.repos b/ros2_control_demos.iron.repos
index 4b077103..29d4ba16 100644
--- a/ros2_control_demos.iron.repos
+++ b/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