Skip to content

Commit 4a715d5

Browse files
authored
Automerge (#480)
* Classic automerge --------- Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
1 parent 857a12f commit 4a715d5

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

.backportrc.json

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

.github/mergify.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,10 @@ 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+
- name: Automatic merge
21+
description: Merge when PR passes all branch protection and has label automerge
22+
conditions:
23+
# Branch protections are automatically injected
24+
- label = automerge
25+
actions:
26+
merge:

0 commit comments

Comments
 (0)