From 335c5c2fa271a23936d6a01e802d694ecc2dcb87 Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Thu, 28 Apr 2022 14:09:58 +0200 Subject: [PATCH] ci(Mergify): configuration update Signed-off-by: Heitor Lessa --- .github/mergify.yml | 56 +++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8e010eeca2..a623796a51 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,29 +1,31 @@ -queue_rules: - - name: default - conditions: - # Conditions to get out of the queue (= merged) - - check-success=Semantic Pull Request - - "#approved-reviews-by>=1" - - -title~=(WIP|wip) - - -label~="do-not-merge" - - "#changes-requested-reviews-by=0" +## Temporarily disabled after Mergify breaking changes +## might move to custom GitHub Actions altogether +# queue_rules: +# - name: default +# conditions: +# # Conditions to get out of the queue (= merged) +# - check-success=Semantic Pull Request +# - "#approved-reviews-by>=1" +# - -title~=(WIP|wip) +# - -label~="do-not-merge" +# - "#changes-requested-reviews-by=0" -pull_request_rules: - - name: automatic merge for Dependabot pull requests - conditions: - - author~=^dependabot(|-preview)\[bot\]$ - actions: - queue: - name: default - method: squash - commit_message: title+body +# pull_request_rules: +# - name: automatic merge for Dependabot pull requests +# conditions: +# - author~=^dependabot(|-preview)\[bot\]$ +# actions: +# queue: +# name: default +# method: squash +# commit_message: title+body - - name: Automatic merge ⬇️ on approval ✔ - conditions: - - base!=master - - "#approved-reviews-by>=2" - actions: - queue: - name: default - method: squash - commit_message: title+body +# - name: Automatic merge ⬇️ on approval ✔ +# conditions: +# - base!=master +# - "#approved-reviews-by>=2" +# actions: +# queue: +# name: default +# method: squash +# commit_message: title+body