.

.drone.yml

@@ -17,11 +17,12 @@ 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 checkout -b master
+    - git checkout -b master
-    #- git pull origin master
+    - git pull origin master
     # - git branch -D product-development
     - git checkout -b product-development
+    - git merge format-branch
     #- git merge --squash --no-commit --strategy-option=theirs format-branch
   environment:
     GIT_PASSWORD:
@@ -45,6 +46,7 @@ steps:
     branch:
     - format-branch
   commands:
+    - node /app/servers/apps/batch2yaml/build/index.js . delete
     - node /app/servers/apps/batch2yaml/build/index.js . yml
   volumes:
   - name: dockersock
@@ -68,7 +70,7 @@ steps:
   commands:
     - 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 commit -m "deploying- $${DRONE_COMMIT_MESSAGE}"
     - git push -f origin HEAD:deployed
   environment:
     GIT_PASSWORD:
@@ -99,7 +101,7 @@ steps:
     - 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 -f origin HEAD:product-development
+    - git push origin HEAD:product-development
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD