Skip to content

Commit fd9c5c2

Browse files
ct2034mergify[bot]
authored andcommitted
Listing all checks for automerge (#484)
* all checks --------- Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> (cherry picked from commit 7f36aee) # Conflicts: # .backportrc.json # .github/mergify.yml
1 parent 2f334b7 commit fd9c5c2

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

.backportrc.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"repoName": "diagnostics",
3+
"repoOwner": "ros",
4+
"sourceBranch": "ros2",
5+
"targetBranchChoices": [
6+
"ros2-humble",
7+
"ros2-jazzy",
8+
"ros2-kilted"
9+
],
10+
"targetPRLabels": [
11+
"automerge"
12+
]
13+
}

.github/mergify.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,26 @@ pull_request_rules:
1717
actions:
1818
close:
1919
message: Please make all PRs against the `ros2` branch. They will be backported if possible.
20-
20+
<<<<<<< HEAD
21+
22+
=======
23+
- name: Automatic merge
24+
description: Merge when PR passes all branch protection and has label automerge
25+
conditions:
26+
- label = automerge
27+
# we have to list all checks, apparently
28+
- check-success = Check licenses
29+
- check-success = Lint cppcheck
30+
- check-success = Lint cpplint
31+
- check-success = Lint flake8
32+
- check-success = Lint uncurstify
33+
- check-success = Lint xmllint
34+
- check-success = diagnostic_aggregator on rolling
35+
- check-success = diagnostic_common_diagnostics on rolling
36+
- check-success = diagnostic_remote_logging on rolling
37+
# - check-success = diagnostic_topic_monitor on rolling
38+
- check-success = diagnostic_updater on rolling
39+
- check-success = self_test on rolling
40+
actions:
41+
merge:
42+
>>>>>>> 7f36aee (Listing all checks for automerge (#484))

0 commit comments

Comments
 (0)