..
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
1cad050d43
commit
2d1d2420ca
11
.drone.yml
11
.drone.yml
|
@ -18,20 +18,9 @@ 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 fetch
|
- git fetch
|
||||||
#- git checkout master
|
|
||||||
#- git log -n 1
|
|
||||||
#- git pull origin master
|
|
||||||
#- git log -n 1
|
|
||||||
# - git branch -D product-development
|
|
||||||
- git checkout -b product-development
|
- git checkout -b product-development
|
||||||
#- git merge format-branch
|
|
||||||
- git log -n 1
|
|
||||||
- git merge --squash --no-commit --strategy-option=theirs format-branch
|
- git merge --squash --no-commit --strategy-option=theirs format-branch
|
||||||
# - git checkout format-branch **/*.*
|
|
||||||
- git status
|
|
||||||
- git log -n 1
|
|
||||||
environment:
|
environment:
|
||||||
GIT_PASSWORD:
|
GIT_PASSWORD:
|
||||||
from_secret: GIT_PASSWORD
|
from_secret: GIT_PASSWORD
|
||||||
|
|
Loading…
Reference in New Issue