Merge pull request '.' (#35) from product-development into master
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
Reviewed-on: #35
This commit is contained in:
commit
52a1fa2ffd
|
@ -36,7 +36,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 fetch
|
- git fetch
|
||||||
- git checkout product-development
|
- git checkout -b product-development
|
||||||
- git merge format-branch
|
- git merge format-branch
|
||||||
environment:
|
environment:
|
||||||
GIT_PASSWORD:
|
GIT_PASSWORD:
|
||||||
|
@ -52,7 +52,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 fetch
|
- git fetch
|
||||||
- git checkout deployed
|
- git checkout -b deployed
|
||||||
- git merge master
|
- git merge master
|
||||||
environment:
|
environment:
|
||||||
GIT_PASSWORD:
|
GIT_PASSWORD:
|
||||||
|
|
Loading…
Reference in New Issue