Merge pull request '.' (#54) from product-development into master
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #54
This commit is contained in:
commit
482d1e2ac2
10
.drone.yml
10
.drone.yml
|
@ -17,11 +17,12 @@ steps:
|
||||||
- format-branch
|
- 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 checkout -b master
|
- git checkout -b master
|
||||||
#- git pull origin master
|
- git pull origin master
|
||||||
# - git branch -D product-development
|
# - git branch -D product-development
|
||||||
- git checkout -b product-development
|
- git checkout -b product-development
|
||||||
|
- git merge format-branch
|
||||||
#- git merge --squash --no-commit --strategy-option=theirs format-branch
|
#- git merge --squash --no-commit --strategy-option=theirs format-branch
|
||||||
environment:
|
environment:
|
||||||
GIT_PASSWORD:
|
GIT_PASSWORD:
|
||||||
|
@ -45,6 +46,7 @@ steps:
|
||||||
branch:
|
branch:
|
||||||
- format-branch
|
- format-branch
|
||||||
commands:
|
commands:
|
||||||
|
- node /app/servers/apps/batch2yaml/build/index.js . delete
|
||||||
- node /app/servers/apps/batch2yaml/build/index.js . yml
|
- node /app/servers/apps/batch2yaml/build/index.js . yml
|
||||||
volumes:
|
volumes:
|
||||||
- name: dockersock
|
- name: dockersock
|
||||||
|
@ -69,7 +71,7 @@ steps:
|
||||||
- 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 "deploying- $${DRONE_COMMIT_MESSAGE}"
|
- git commit -m "deploying- $${DRONE_COMMIT_MESSAGE}"
|
||||||
- git push origin HEAD:deployed
|
- git push -f origin HEAD:deployed
|
||||||
environment:
|
environment:
|
||||||
GIT_PASSWORD:
|
GIT_PASSWORD:
|
||||||
from_secret: GIT_PASSWORD
|
from_secret: GIT_PASSWORD
|
||||||
|
|
Loading…
Reference in New Issue