Merge pull request 'uuuuu' (#46) from product-development into master
continuous-integration/drone/push Build is passing Details

Reviewed-on: #46
This commit is contained in:
giles 2023-10-18 21:40:51 +00:00
commit 15f97007a1
1 changed files with 20 additions and 3 deletions

View File

@ -11,6 +11,23 @@ clone:
disable: false disable: false
steps: steps:
- name: "git - pre format"
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 checkout -b master
- git pull origin master
- git branch -D product-development
- git checkout product-development
- merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
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 image: sigyl/zone-10-batch2yaml:latest
when: when:
@ -25,7 +42,7 @@ steps:
image: sigyl/zone-10-batch2yaml:latest image: sigyl/zone-10-batch2yaml:latest
when: when:
branch: branch:
- deployed - format-branch
commands: commands:
- node /app/servers/apps/batch2yaml/build/index.js . yml - node /app/servers/apps/batch2yaml/build/index.js . yml
volumes: volumes:
@ -60,7 +77,7 @@ steps:
- name: "git - product-development" - name: "git - product-development"
when: when:
branch: branch:
- deployed - format-branch
image: alpine/git:latest image: alpine/git:latest
commands: 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'
@ -100,7 +117,7 @@ volumes:
trigger: trigger:
branch: branch:
- deployed - format-branch
- master - master
event: event:
- push - push