another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

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

Reviewed-on: #54
This commit is contained in:
giles 2023-10-18 23:13:05 +00:00
parent 61896dd077 083e62ff4b
commit 482d1e2ac2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.drone.yml
View File

@ -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 checkout -b master
#- git pull origin master
- 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 -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
@ -69,7 +71,7 @@ steps:
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
- git add -A
- git commit -m "deploying- $${DRONE_COMMIT_MESSAGE}"
- git push origin HEAD:deployed
- git push -f origin HEAD:deployed
environment:
GIT_PASSWORD:
from_secret: GIT_PASSWORD