More mergify

.github/mergify.yml

@@ -1,3 +1,22 @@
+shared:
+  all_ci: &all_checks
+    # 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 uncrustify
+    - check-success = Lint xmllint
+    - check-success ~= diagnostic_aggregator on [a-z]+
+    - check-success ~= diagnostic_common_diagnostics on [a-z]+
+    - check-success ~= diagnostic_remote_logging on [a-z]+
+    # - check-success ~= diagnostic_topic_monitor on [a-z]+
+    - check-success ~= diagnostic_updater on [a-z]+
+    - check-success ~= self_test on [a-z]+
+    # This makes sure the buildfarm job succeeds in case it is added while the others run
+    - #check-failure = 0
+    - #check-pending = 0
+
 pull_request_rules:
   - name: add ros2 label
     description: If targeting an ROS2 branch, add the label
@@ -20,19 +39,8 @@
   - name: Automatic merge
     description: Merge when PR passes all branch protection and has label automerge
     conditions:
-      - 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 uncrustify
-      - check-success = Lint xmllint
-      - check-success ~= diagnostic_aggregator on [a-z]+
-      - check-success ~= diagnostic_common_diagnostics on [a-z]+
-      - check-success ~= diagnostic_remote_logging on [a-z]+
-      # - check-success ~= diagnostic_topic_monitor on [a-z]+
-      - check-success ~= diagnostic_updater on [a-z]+
-      - check-success ~= self_test on [a-z]+
+      - and:
+        - label = automerge
+        - *all_ci
     actions:
       merge:

README.md

@@ -49,10 +49,8 @@ From there, the changes are backported to the other branches.
 
 This tool has proven to be useful: [backport](https://www.npmjs.com/package/backport)
 
-Use this command to port a given PR of `PR_NUMBER` to the other branches:
-
 ```bash
-backport --pr PR_NUMBER -b ros2-humble ros2-jazzy ros2-kilted
+yarn backport --config $(pwd)/.backportrc.json
 ```
 
 ## Versioning and Releases