From 2de567bab13379581230771e8cd89c0a9cfc78e7 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sat, 4 Nov 2023 19:43:20 +0000 Subject: [PATCH 1/6] Remove foxy+galactic files --- ros2_control_demos-not-released.foxy.repos | 1 - ros2_control_demos-not-released.galactic.repos | 1 - ros2_control_demos.foxy.repos | 17 ----------------- ros2_control_demos.galactic.repos | 17 ----------------- 4 files changed, 36 deletions(-) delete mode 100644 ros2_control_demos-not-released.foxy.repos delete mode 100644 ros2_control_demos-not-released.galactic.repos delete mode 100644 ros2_control_demos.foxy.repos delete mode 100644 ros2_control_demos.galactic.repos diff --git a/ros2_control_demos-not-released.foxy.repos b/ros2_control_demos-not-released.foxy.repos deleted file mode 100644 index 56f46b6f7..000000000 --- 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 56f46b6f7..000000000 --- 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 b64aedeb7..000000000 --- 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 79f5e99d2..000000000 --- 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 From 6f1df90f76b36a84aed1045ee447e2f4b4bc8432 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sat, 4 Nov 2023 19:43:35 +0000 Subject: [PATCH 2/6] Remvoe prerelease check workflow --- .github/workflows/prerelease-check.yml | 39 -------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .github/workflows/prerelease-check.yml diff --git a/.github/workflows/prerelease-check.yml b/.github/workflows/prerelease-check.yml deleted file mode 100644 index 809471897..000000000 --- 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 From 7a78c9c6055b50478a2351d9813bfb34451aa648 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sat, 4 Nov 2023 19:43:47 +0000 Subject: [PATCH 3/6] Switch to iron branches --- .github/workflows/iron-binary-build.yml | 4 ++-- .github/workflows/iron-docker-build.yaml | 4 ++-- .github/workflows/iron-semi-binary-build.yml | 4 ++-- README.md | 7 +++---- ros2_control_demos.iron.repos | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build.yml index 36a77af98..99e75bd01 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 20188edc7..fb95d2128 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 6fdcc17b0..7f7396e8a 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/README.md b/README.md index 96995c74a..62370d87e 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) | [![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)
[![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)
| [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) | [![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)
[![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)
| [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) | [![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)
[![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)
| [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) | [![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)
[![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)
| [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) | [![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)
[![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)
| [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) | [![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)
[![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)
| [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) | [![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)
[![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)
| [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.iron.repos b/ros2_control_demos.iron.repos index 4b0771038..29d4ba168 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 From 9c510918280f810bafc2510276cb9a432beff9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 7 Nov 2023 08:18:37 +0100 Subject: [PATCH 4/6] Create mergify.yml --- .github/mergify.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/mergify.yml diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 000000000..e1f7f21a1 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,26 @@ +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 + actions: + comment: + message: This pull request is in conflict. Could you fix it @{{author}}? From e10477b53c8af9999fdcf8b94ff716084587a0bc Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 10 Dec 2023 13:33:02 +0000 Subject: [PATCH 5/6] Add dependabot config --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 05a48fc65..58c6bfaed 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" From 9ab647d98ee07e090e27fd349f2b333eaa81c3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Fri, 15 Dec 2023 18:40:25 +0100 Subject: [PATCH 6/6] Update mergify.yml --- .github/mergify.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index e1f7f21a1..0a6e425a3 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -20,7 +20,31 @@ pull_request_rules: - name: Ask to resolve conflict conditions: - conflict - - author!=mergify + - 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.