this sisisis
continuous-integration/drone/push Build is passing Details

This commit is contained in:
giles 2023-10-19 00:52:15 +01:00
parent 3a17a92d05
commit 349a723537
1 changed files with 3 additions and 3 deletions

View File

@ -27,9 +27,9 @@ steps:
# - 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 format-branch
#- git merge --squash --no-commit --strategy-option=theirs format-branch
- git log -n 1 - git log -n 1
- git checkout format-branch **/*.* - git merge --squash --no-commit --strategy-option=theirs format-branch
# - git checkout format-branch **/*.*
- git status - git status
- git log -n 1 - git log -n 1
environment: environment:
@ -108,7 +108,7 @@ steps:
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 "converted to yml - $${DRONE_COMMIT_MESSAGE}"
- git push -f origin HEAD:product-development - git push -f origin HEAD:product-development
environment: environment:
GIT_PASSWORD: GIT_PASSWORD: