From 21952f4cf0d08d877ce4bd443024a2de6c0ceb77 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Thu, 1 Jun 2023 10:40:33 +0930
Subject: [PATCH] feat(ci): use project gitlab-ci automagic template

!6 close #1
---
 .gitlab-ci.yml       | 2 +-
 .nfc_automation.yaml | 8 ++++++++
 gitlab-ci            | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .nfc_automation.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17da79b..69b55b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ include:
     ref: development
     file:
       - .gitlab-ci_common.yaml
-      - template/docker-image.gitlab-ci.yaml
+      - template/automagic.gitlab-ci.yaml
 
 
 variables:
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
diff --git a/gitlab-ci b/gitlab-ci
index 588956b..e9713b3 160000
--- a/gitlab-ci
+++ b/gitlab-ci
@@ -1 +1 @@
-Subproject commit 588956b27ec8973bf8a0ce39566f1ec07a0c2f6b
+Subproject commit e9713b31c8e5b30c27331eea23a690194f63394f