.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
giles 2023-10-18 23:18:52 +01:00
parent f4e4081442
commit c3e6dc350a
1 changed files with 4 additions and 4 deletions

View File

@ -17,12 +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 --squash --no-commit --strategy-option=theirs format-branch
#- git merge --squash --no-commit --strategy-option=theirs format-branch
environment:
GIT_PASSWORD:
from_secret: GIT_PASSWORD