From cab22cebfa98d50774b4b433fed5f1727f596a26 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Mon, 29 May 2023 15:11:58 +0930
Subject: [PATCH] fix(ci): added automation config

!13
---
 .gitlab-ci.yml       | 2 +-
 .nfc_automation.yaml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .nfc_automation.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffa51e2..b5d2d7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ Compile Dovecot:
       when: never
     - if: $CI_COMMIT_TAG
       when: never
-    - if: '$CI_COMMIT_BRANCH != "master"'
+    - if: '$CI_COMMIT_BRANCH != "master" && $CI_PIPELINE_SOURCE == "push"'
       when: manual
       allow_failure: true
     - when: never
diff --git a/.nfc_automation.yaml b/.nfc_automation.yaml
new file mode 100644
index 0000000..077d7f4
--- /dev/null
+++ b/.nfc_automation.yaml
@@ -0,0 +1,8 @@
+---
+
+role_git_conf:
+  gitlab:
+    submodule_branch: "development"
+    default_branch: development
+    mr_labels: ~"type::automation" ~"impact::0" ~"priority::0"
+    auto_merge: true