Merge pull request '..' (#154) from develop/1002 into master

Reviewed-on: #154

.gitea/workflows/build->develop.yml

@@ -50,6 +50,25 @@ jobs:
           CI_COMMIT_AUTHOR: Continuous Integration
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
+            git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
+            git -C ../cloned fetch origin #--depth=1
+            git -C ../cloned branch -r
+            git -C ../cloned checkout master || git -C ../cloned checkout -b master
+            mv ../cloned/.git ..
+            rm -rf ../cloned
+            cp -r . ../cloned
+            rm -rf ../cloned/.git
+            mv ../.git ../cloned
+            mv .git/config ../cloned/.git
+            rm -r ./*
+            rm -r .git
+            mv ../cloned/* .
+            mv ../cloned/.git .
+            git status
+            git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
+            git add -A
+            git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;

.gitea/workflows/develop -> build.yml

@@ -47,7 +47,6 @@ jobs:
           git checkout -b ${{ env.BUILD_BRANCH }}
           git merge --squash ${{ github.ref_name }}
           if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-
             git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
             git -C ../cloned fetch origin #--depth=1
             git -C ../cloned branch -r

equipment-model.a.yml

@@ -135,7 +135,7 @@
       - Required: '0'
       - ApproveSignatureTemplateName: null
       - RevertSignatureTemplateName: null
-      - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for  v vredcdview.s...gfhhh....
+      - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh....
     - RecipeApprovalStep:
       - Name: Review Recipe
       - Id: '-3'