Compare commits

...

14 Commits

Author SHA1 Message Date
giles cbe5d4c5b6 converted to yml - hhhh
continuous-integration/drone/push Build is passing Details
2023-10-18 23:59:48 +00:00
giles 355ad3fb0b hhhh
continuous-integration/drone/push Build is passing Details
2023-10-19 00:59:35 +01:00
giles fe1171a7a6 hhhh
continuous-integration/drone/push Build is passing Details
2023-10-19 00:54:08 +01:00
giles 349a723537 this sisisis
continuous-integration/drone/push Build is passing Details
2023-10-19 00:52:15 +01:00
giles 3a17a92d05 99
continuous-integration/drone/push Build is failing Details
2023-10-19 00:47:06 +01:00
giles 47d21392bd 99
continuous-integration/drone/push Build is passing Details
2023-10-19 00:43:43 +01:00
giles 43a8ea8682 88
continuous-integration/drone/push Build is passing Details
2023-10-19 00:42:23 +01:00
giles a0172a5d2d 77
continuous-integration/drone/push Build is passing Details
2023-10-19 00:40:55 +01:00
giles 6c1f128d47 oooo
continuous-integration/drone/push Build is passing Details
2023-10-19 00:36:34 +01:00
giles afe5437268 ahahah
continuous-integration/drone/push Build is passing Details
2023-10-19 00:34:21 +01:00
giles b99929d918 haha
continuous-integration/drone/push Build is passing Details
2023-10-19 00:27:38 +01:00
giles 8480a7b9e1 some more changes
continuous-integration/drone/push Build is failing Details
2023-10-19 00:19:55 +01:00
giles 6f4e2da714 some changes
continuous-integration/drone/push Build is passing Details
2023-10-19 00:17:56 +01:00
giles f484ad72b1 deploying- Merge pull request '.' (#55) from product-development into master
Reviewed-on: #55
2023-10-18 23:16:13 +00:00
2 changed files with 13 additions and 5 deletions

View File

@ -18,12 +18,20 @@ 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 checkout -b master - git log -n 1
- git pull origin master - git fetch
#- git checkout master
#- git log -n 1
#- 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 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
@ -100,8 +108,8 @@ 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 origin HEAD:product-development - git push -f origin HEAD:product-development
environment: environment:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: GIT_PASSWORD from_secret: GIT_PASSWORD

View File

@ -135,7 +135,7 @@
- Required: '0' - Required: '0'
- ApproveSignatureTemplateName: null - ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: 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: - RecipeApprovalStep:
- Name: Review Recipe - Name: Review Recipe
- Id: '-3' - Id: '-3'