Merge pull request '.' (#40) from product-development into master
continuous-integration/drone/push Build encountered an error Details

Reviewed-on: #40
This commit is contained in:
giles 2023-10-18 20:51:27 +00:00
commit 90f32e372e
1 changed files with 21 additions and 38 deletions

View File

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