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

Reviewed-on: #36
This commit is contained in:
giles 2023-10-18 20:28:37 +00:00
commit 2700af3276
1 changed files with 2 additions and 2 deletions

View File

@ -50,7 +50,7 @@ steps:
- master - master
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 fetch - git fetch
- git checkout -b deployed - git checkout -b deployed
- git merge master - git merge master
@ -101,7 +101,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 '$${DRONE_COMMIT_MESSAGE}' - git commit -m '$${DRONE_COMMIT_MESSAGE}'
- git push origin - git push origin --set-upstream $$(git symbolic-ref --short HEAD)
environment: environment:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: GIT_PASSWORD from_secret: GIT_PASSWORD