T7748: using mergify rule to handle conflict checks for private repo

3 files changed, 37 insertions, 1 deletions

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 000000000..985cf0981
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,10 @@
+pull_request_rules:
+  - name: Label conflicting pull requests
+    description: Add a label to a pull request with conflict to spot it easily
+    conditions:
+      - conflict
+      - '-closed'
+    actions:
+      label:
+        toggle:
+          - conflict
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index f09e66415..9b0b97423 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -9,6 +9,7 @@ permissions:
   contents: read
 
 jobs:
-  check-pr-conflict-call:
+  check-pr-conflict:
+    if: github.repository_owner == 'vyos'
     uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
     secrets: inherit
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000..635cb9e97
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,25 @@
+# pull_request_rules:
+#   - name: merge automatically when CI passes and PR is approved
+#     conditions:
+#       - conflict
+#     actions:
+#       comment:
+#         message: Your PR is in conflict, {{author}}. You should fix it.
+
+pull_request_rules:
+  - name: Label conflicting pull requests
+    description: Add a label to a pull request with conflict to spot it easily
+    conditions:
+      - conflict
+      - '-closed'
+    actions:
+      label:
+        toggle:
+          - conflict
+
+  - name: comment when a pull request is merged
+    conditions:
+      - merged
+    actions:
+      comment:
+        message: Thank you for your contribution @{{author}}! Your pull request has been merged.