From 614245bcd5f5bfbbf13d27fe5746f46cf8520173 Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Wed, 11 Oct 2023 11:26:21 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20CI=20Change?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/.mergify.yml  |  9 ---------
 .github/mergify.yml   | 11 +++++++++++
 .github/renovate.json |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 .github/.mergify.yml
 create mode 100644 .github/mergify.yml

diff --git a/.github/.mergify.yml b/.github/.mergify.yml
deleted file mode 100644
index ef882e5..0000000
--- a/.github/.mergify.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
-      - "check-success=build"
-      - "check-success=test"
-      - "#check-failure=0"
-    actions:
-      merge:
-        method: merge
diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 0000000..ab5f452
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,11 @@
+pull_request_rules:
+  - name: Automatic merge on CI
+    conditions:
+      - or:
+        - base=main
+        - base=dev
+      - "status-success=test"
+      - "status-success=build"
+    actions:
+      merge:
+        method: merge
diff --git a/.github/renovate.json b/.github/renovate.json
index 9d7476a..7d47dab 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -5,6 +5,7 @@
     ":semanticCommitTypeAll(⬆️ 🛠️)",
     ":disableDependencyDashboard"
   ],
+  "gitIgnoredAuthors": ["githubaction@githubaction.com"],
   "semanticCommits": "enabled",
   "labels": ["dependencies"],
   "baseBranches": ["dev"],