From 99ec1fff0c823f21440f9ca84d7d9c9daf659ab7 Mon Sep 17 00:00:00 2001 From: Christian Henkel Date: Thu, 15 May 2025 13:07:14 +0200 Subject: [PATCH 1/3] automatically add ros2 label Signed-off-by: Christian Henkel --- .github/workflows/mergify.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/workflows/mergify.yml diff --git a/.github/workflows/mergify.yml b/.github/workflows/mergify.yml new file mode 100644 index 000000000..ce52ad3c8 --- /dev/null +++ b/.github/workflows/mergify.yml @@ -0,0 +1,9 @@ +pull_request_rules: + - name: add ros2 label + description: If targeting an ROS2 branch, add the label + conditions: + - base=ros2 + actions: + label: + add: + - ros2 \ No newline at end of file From 4cd1e3b6c6ad3b41405251302a90034f2274f9c7 Mon Sep 17 00:00:00 2001 From: Christian Henkel Date: Thu, 15 May 2025 13:08:44 +0200 Subject: [PATCH 2/3] wrong folder Signed-off-by: Christian Henkel --- .github/workflows/mergify.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .github/workflows/mergify.yml diff --git a/.github/workflows/mergify.yml b/.github/workflows/mergify.yml deleted file mode 100644 index ce52ad3c8..000000000 --- a/.github/workflows/mergify.yml +++ /dev/null @@ -1,9 +0,0 @@ -pull_request_rules: - - name: add ros2 label - description: If targeting an ROS2 branch, add the label - conditions: - - base=ros2 - actions: - label: - add: - - ros2 \ No newline at end of file From eee297e62aff243ca055a0146823f9661e0f38ad Mon Sep 17 00:00:00 2001 From: Christian Henkel Date: Thu, 15 May 2025 22:05:19 +0200 Subject: [PATCH 3/3] all checks Signed-off-by: Christian Henkel --- .backportrc.json | 3 +-- .github/mergify.yml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index f96840f5f..73e52819d 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,9 +1,8 @@ { - "repoName": "diagnostic", + "repoName": "diagnostics", "repoOwner": "ros", "sourceBranch": "ros2", "targetBranchChoices": [ - "ros2-rolling", "ros2-humble", "ros2-jazzy", "ros2-kilted" diff --git a/.github/mergify.yml b/.github/mergify.yml index 0bd4c1ae5..e456ca058 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -20,7 +20,19 @@ pull_request_rules: - name: Automatic merge description: Merge when PR passes all branch protection and has label automerge conditions: - # Branch protections are automatically injected - label = automerge + # we have to list all checks, apparently + - check-success = Check licenses + - check-success = Lint cppcheck + - check-success = Lint cpplint + - check-success = Lint flake8 + - check-success = Lint uncurstify + - check-success = Lint xmllint + - check-success = diagnostic_aggregator on rolling + - check-success = diagnostic_common_diagnostics on rolling + - check-success = diagnostic_remote_logging on rolling + # - check-success = diagnostic_topic_monitor on rolling + - check-success = diagnostic_updater on rolling + - check-success = self_test on rolling actions: merge: \ No newline at end of file