From 2243401608249e43b35d2acf1a3cf50511e1a2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Wed, 16 Aug 2023 09:17:45 +0200 Subject: [PATCH 1/2] ci(Mergify): configuration update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Orhun Parmaksız --- .mergify.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000000..ded81734bb --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,15 @@ +pull_request_rules: + - name: Automatic merge for Dependabot pull requests + conditions: + - author=dependabot[bot] + actions: + merge: + method: squash + + - name: Automatic update to the main branch for pull requests + conditions: + - -conflict # skip PRs with conflicts + - -draft # skip GH draft PRs + - -author=dependabot[bot] # skip dependabot PRs + actions: + update: \ No newline at end of file From 13feab9e2b6c5467b6f59f97ec12af5348dd4380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Wed, 16 Aug 2023 10:19:19 +0300 Subject: [PATCH 2/2] chore(mergify): move config to .github --- .mergify.yml => .github/.mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .mergify.yml => .github/.mergify.yml (96%) diff --git a/.mergify.yml b/.github/.mergify.yml similarity index 96% rename from .mergify.yml rename to .github/.mergify.yml index ded81734bb..5038fc8d9a 100644 --- a/.mergify.yml +++ b/.github/.mergify.yml @@ -12,4 +12,4 @@ pull_request_rules: - -draft # skip GH draft PRs - -author=dependabot[bot] # skip dependabot PRs actions: - update: \ No newline at end of file + update: