diff --git a/.drone.yml b/.drone.yml index 5c7253b..6f4ad36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,12 +18,20 @@ 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 log -n 1 + - 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 merge format-branch + - git log -n 1 - git merge --squash --no-commit --strategy-option=theirs format-branch + # - git checkout format-branch **/*.* + - git status + - git log -n 1 environment: GIT_PASSWORD: from_secret: GIT_PASSWORD @@ -100,8 +108,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 diff --git a/equipment-model.a.yml b/equipment-model.a.yml index 7038e53..e61b267 100644 --- a/equipment-model.a.yml +++ b/equipment-model.a.yml @@ -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'