Merge branch 'format-branch' into product-development

.drone.yml

@@ -82,8 +82,32 @@ steps:
     - master
   image: alpine/git:latest
   commands:
+    - git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
+    - git fetch
     - git checkout deployed
     - git merge master
+  environment:
+    GIT_PASSWORD:
+      from_secret: GIT_PASSWORD
+    GIT_USER:
+      from_secret: GIT_USER
+  
+- name: "check out product-development"
+  when:
+    branch:
+    - 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
+    - git checkout product-development
+    - git merge format-branch
+  environment:
+    GIT_PASSWORD:
+      from_secret: GIT_PASSWORD
+    GIT_USER:
+      from_secret: GIT_USER
+
 - name: "convert to xml"
   image: sigyl/zone-10-batch2yaml:latest
   when:
@@ -104,6 +128,17 @@ steps:
   volumes:
   - name: dockersock
     path: /var/run
+- name: "git - status"
+  when:
+    branch:
+    - master
+    - format-branch
+  image: alpine/git:latest
+  commands:
+    - git status
+  volumes:
+  - name: dockersock
+    path: /var/run
 - name: "git - deployed"
   when:
     branch:
@@ -111,9 +146,15 @@ steps:
     - format-branch
   image: alpine/git:latest
   commands:
-    - git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
+    - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
+    - git add -A
     - git commit -m '$${DRONE_COMMIT_MESSAGE}'
     - git push origin
+  environment:
+    GIT_PASSWORD:
+      from_secret: GIT_PASSWORD
+    GIT_USER:
+      from_secret: GIT_USER
   volumes:
   - name: dockersock
     path: /var/run