Merge pull request 'this is a PR! it rocks!' (#56) from product-development into master
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #56
This commit is contained in:
commit
318014ce06
|
@ -18,11 +18,8 @@ steps:
|
|||
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 branch -D product-development
|
||||
- git fetch
|
||||
- git checkout -b product-development
|
||||
#- git merge format-branch
|
||||
- git merge --squash --no-commit --strategy-option=theirs format-branch
|
||||
environment:
|
||||
GIT_PASSWORD:
|
||||
|
@ -100,8 +97,8 @@ steps:
|
|||
commands:
|
||||
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
||||
- git add -A
|
||||
- git commit -m "$${DRONE_COMMIT_MESSAGE}"
|
||||
- git push origin HEAD:product-development
|
||||
- git commit -m "converted to yml - $${DRONE_COMMIT_MESSAGE}"
|
||||
- git push -f origin HEAD:product-development
|
||||
environment:
|
||||
GIT_PASSWORD:
|
||||
from_secret: GIT_PASSWORD
|
||||
|
|
|
@ -135,7 +135,7 @@
|
|||
- Required: '0'
|
||||
- ApproveSignatureTemplateName: null
|
||||
- RevertSignatureTemplateName: null
|
||||
- Description: Confirmation by the author of the recipe that it is ready for review.....
|
||||
- Description: Confirmation by the author of the recipe that it is ready for review.s.......
|
||||
- RecipeApprovalStep:
|
||||
- Name: Review Recipe
|
||||
- Id: '-3'
|
||||
|
|
Loading…
Reference in New Issue