Merge pull request #159 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for kubernetes-csi-addons
red-hat-storage · Jun 24, 2024 · 02a25df · 02a25df
2 parents e12c7df + e3d2384
commit 02a25df
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -28,6 +28,7 @@ pull_request_rules:
   - name: merge after two approvals (no API changes)
     conditions:
       - base~=^(main)|(release-.+)$
+      - label!=DNM
       - label!=api
       - "#approved-reviews-by>=2"
       - "#changes-requested-reviews-by=0"
@@ -46,6 +47,7 @@ pull_request_rules:
   - name: API changes needs approval from a contributor and a reviewer
     conditions:
       - base~=^(main)|(release-.+)$
+      - label!=DNM
       - label=api
       - "#approved-reviews-by>=2"
       - "#changes-requested-reviews-by=0"
@@ -63,6 +65,13 @@ pull_request_rules:
       queue: {}
       dismiss_reviews: {}
       delete_head_branch: {}
+  - name: pr title contains DNM
+    conditions:
+      - title~=DNM
+    actions:
+      label:
+        add:
+          - DNM
   - name: label API change
     conditions:
       - files~=^(api/)