another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

Merge pull request 'product-development' (#47) from product-development into master
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #47
This commit is contained in:
giles 2023-10-18 21:52:23 +00:00
parent 15f97007a1 eae4a75f0a
commit 226c04bed7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -20,9 +20,9 @@ steps:
- 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 checkout -b master
- git pull origin master - git pull origin master
- git branch -D product-development # - git branch -D product-development
- git checkout product-development - git checkout -b product-development
- merge --squash --no-commit --no-ff --strategyoption=theirs format-branch - git merge --squash --no-commit --strategy-option=theirs format-branch
environment: environment:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: GIT_PASSWORD from_secret: GIT_PASSWORD

2
equipment-model.a.yml
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..
- RecipeApprovalStep: - RecipeApprovalStep:
- Name: Review Recipe - Name: Review Recipe
- Id: '-3' - Id: '-3'