Merge branch 'main' into carlos/update-compatibility-tests

cosmos · Dec 16, 2022 · f4d6cee · f4d6cee
2 parents 562485d + 866bb9a
commit f4d6cee
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -65,7 +65,15 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - release/v4.2.x  
+          - release/v4.2.x
+  - name: backport patches to v4.3.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v4.3.x
+    actions:
+      backport:
+        branches:
+          - release/v4.3.x  
   - name: backport patches to v5.2.x branch
     conditions:
       - base=main
@@ -77,8 +85,8 @@ pull_request_rules:
   - name: backport patches to v6.0.x branch
     conditions:
       - base=main
-      - label=backport-to-v6.0.x
+      - label=backport-to-v6.1.x
     actions:
       backport:
         branches:
-          - release/v6.0.x
+          - release/v6.1.x