diff --git a/.gitea/workflows/build->develop.myml b/.gitea/workflows/build->develop.---myml similarity index 100% rename from .gitea/workflows/build->develop.myml rename to .gitea/workflows/build->develop.---myml diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index ac2097a..4363d8a 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -46,7 +46,7 @@ jobs: git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git checkout -b ${{ env.BUILD_BRANCH }} git merge --squash ${{ github.ref_name }} - git push origin HEAD:${{ env.BUILD_BRANCH }} + git push -f origin HEAD:${{ env.BUILD_BRANCH }} - name: make pull request comment run: | diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index e874e0e..bd9c285 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -25,9 +25,13 @@ jobs: firstString=${{ github.ref_name }} secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/} + git status - name: clone run: | - git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned fetch origin #--depth=1 + git -C ../cloned branch -r + git -C ../cloned switch $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned @@ -45,7 +49,6 @@ jobs: run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" - git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A git status git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " diff --git a/equipment-model.a.yml b/equipment-model.a.yml index 11cbe7a..104849f 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 redcdview.s...gfhhh.... + - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsdit is ready for redcdview.s...gfhhh.... - RecipeApprovalStep: - Name: Review Recipe - Id: '-3' diff --git a/instructions/equipment-model2.a.yml b/instructions/equipment-model2.a.yml index 56e685c..b2c6286 100644 --- a/instructions/equipment-model2.a.yml +++ b/instructions/equipment-model2.a.yml @@ -135,7 +135,7 @@ - Required: '0' - ApproveSignatureTemplateName: null - RevertSignatureTemplateName: null - - Description: Confirmation by the author of the recipe that it is ready forvfvfsxsxsxvf review.s...hhh.... + - Description: Confirmation by the author of the recipe that it is ready forvfvfssssxsxsxvf review.s...hhh.... - RecipeApprovalStep: - Name: Review Recipe - Id: '-3'