From 28012720305adf53e2d202c4443c79d17b4b5c54 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Wed, 18 Oct 2023 19:00:37 +0100
Subject: [PATCH] .

---
 .drone.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c725f2a..8cf3ad5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -76,6 +76,14 @@ clone:
   disable: false
 
 steps:
+- name: "check out deployed"
+  when:
+    branch:
+    - master
+  image: alpine/git:latest
+  commands:
+    - git checkout deployed
+    - git merge master
 - name: "convert to xml"
   image: sigyl/zone-10-batch2yaml:latest
   when:
@@ -100,15 +108,12 @@ steps:
   when:
     branch:
     - master
+    - format-branch
   image: alpine/git:latest
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
-    - git fetch origin
-    - git checkout deployed
-    - git add -A
     - git commit -m '$${DRONE_COMMIT_MESSAGE}'
-    - git remote -v
-    - git push origin deployed
+    - git push origin
   volumes:
   - name: dockersock
     path: /var/run