From 5714bddde09c46ca7d3372c292ef429c8f0b9898 Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Mon, 17 Jun 2024 21:03:20 +0200 Subject: [PATCH] Add .mergify.yml for automated PR operations A .mergify.yml file has been created to define rules for automatic merging and labeling of conflicting PRs. Additionally, .mergify.yml is added to .gitattributes for export-ignore to prevent it from being included in the project's distribution. --- .gitattributes | 1 + .mergify.yml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 .mergify.yml diff --git a/.gitattributes b/.gitattributes index a6e889f..aaac910 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ /tests export-ignore /.gitattributes export-ignore /.gitignore export-ignore +/.mergify.yml export-ignore /castor.php export-ignore /CODE_OF_CONDUCT.md export-ignore /ecs.php export-ignore diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..b81249e --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,16 @@ +pull_request_rules: + - name: Automatic merge + description: Merge when PR passes all branch protection and has label automerge + conditions: + - label = automerge + actions: + merge: + - 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