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

This commit is contained in:
giles 2023-10-19 00:43:43 +01:00
parent 43a8ea8682
commit 47d21392bd
1 changed files with 5 additions and 1 deletions

View File

@ -18,15 +18,19 @@ steps:
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 log -n 1
- git checkout -b master - git checkout -b master
- git log -n 1
- git pull origin master - git pull origin master
- git log -n 1
# - 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 merge --squash --no-commit --strategy-option=theirs format-branch
- git log -n 1
- git checkout format-branch **/*.* - git checkout format-branch **/*.*
- git status - git status
- git log -n 3 - git log -n 1
environment: environment:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: GIT_PASSWORD from_secret: GIT_PASSWORD