Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"repoName": "diagnostic",
"repoName": "diagnostics",
"repoOwner": "ros",
"sourceBranch": "ros2",
"targetBranchChoices": [
"ros2-rolling",
"ros2-humble",
"ros2-jazzy",
"ros2-kilted"
Expand Down
14 changes: 13 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Loading