diff --git a/.drone.yml b/.drone.yml index 5248096..0723fa9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,39 +28,7 @@ clone: disable: false steps: -- 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 -b product-development - - git merge format-branch - environment: - GIT_PASSWORD: - from_secret: GIT_PASSWORD - GIT_USER: - from_secret: GIT_USER - -- name: "check out deployed" - when: - branch: - - 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 -b deployed - - git merge master - environment: - GIT_PASSWORD: - from_secret: GIT_PASSWORD - GIT_USER: - from_secret: GIT_USER - -- name: "convert to xml" + - name: "convert to xml" image: sigyl/zone-10-batch2yaml:latest when: branch: @@ -74,7 +42,7 @@ steps: image: sigyl/zone-10-batch2yaml:latest when: branch: - - format-branch + - deployed commands: - node /app/servers/apps/batch2yaml/build/index.js . yml volumes: @@ -84,7 +52,7 @@ steps: when: branch: - master - - format-branch + - deployed image: alpine/git:latest commands: - git status @@ -95,18 +63,33 @@ 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 add -A - git commit -m "$${DRONE_COMMIT_MESSAGE}" - - git push -f origin --set-upstream $$(git symbolic-ref --short HEAD) + - git push -f origin deployed environment: GIT_PASSWORD: from_secret: GIT_PASSWORD GIT_USER: from_secret: GIT_USER +- name: "git - product-development" + when: + branch: + - deployed + image: alpine/git:latest + 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 push -f origin product-development + environment: + GIT_PASSWORD: + from_secret: GIT_PASSWORD + GIT_USER: + from_secret: GIT_USER + volumes: - name: dockersock path: /var/run @@ -134,7 +117,7 @@ volumes: trigger: branch: - - format-branch + - deployed - master event: - push