From d312d9d1362bd3822e6a028448c6ab4b4d2c4c96 Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 01:46:15 +0000 Subject: [PATCH 1/6] format/tryagain -> develop/tryagain --- .../{build->develop.myml => build->develop.---myml} | 0 .gitea/workflows/format->develop.yml | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename .gitea/workflows/{build->develop.myml => build->develop.---myml} (100%) 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/format->develop.yml b/.gitea/workflows/format->develop.yml index e874e0e..549e1fa 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -25,9 +25,11 @@ 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 checkout -b $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned @@ -45,7 +47,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 }} " From 994a9c414a97659a3f3899bdc2d0f31c8c198e6f Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 01:52:57 +0000 Subject: [PATCH 2/6] format/tryagain -> develop/tryagain --- .gitea/workflows/format->develop.yml | 3 ++- instructions/equipment-model2.a.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index 549e1fa..73d8516 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -29,7 +29,8 @@ jobs: - name: clone run: | git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - git -C ../cloned checkout -b $DEVELOPMENT_BRANCH + git -C ../cloned fetch --depth=1 + git -C ../cloned checkout $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned 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' From 665cd9242b3375a4235c59395e98fccff60ee38e Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 01:54:18 +0000 Subject: [PATCH 3/6] format/tryagain -> develop/tryagain --- .gitea/workflows/format->develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index 73d8516..14955d0 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -30,6 +30,7 @@ jobs: run: | git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch --depth=1 + git -C ../cloned branch git -C ../cloned checkout $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned From d3babdad01ca4ef39cec3a04f232c52c7daccdcd Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 01:55:34 +0000 Subject: [PATCH 4/6] format/tryagain -> develop/tryagain --- .gitea/workflows/format->develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index 14955d0..9c33316 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -29,7 +29,7 @@ jobs: - name: clone run: | git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - git -C ../cloned fetch --depth=1 + git -C ../cloned fetch origin #--depth=1 git -C ../cloned branch git -C ../cloned checkout $DEVELOPMENT_BRANCH mv ../cloned/.git .. From 80dd8ec1d2ff18e567f4134454c2ffcb1c4bd98d Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 02:00:59 +0000 Subject: [PATCH 5/6] format/tryagain -> develop/tryagain --- .gitea/workflows/format->develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index 9c33316..bd9c285 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -30,8 +30,8 @@ jobs: run: | git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch origin #--depth=1 - git -C ../cloned branch - git -C ../cloned checkout $DEVELOPMENT_BRANCH + git -C ../cloned branch -r + git -C ../cloned switch $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned From 4cc3e0bc041d394b517572ab63080451717c9f8d Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 02:03:33 +0000 Subject: [PATCH 6/6] format/tryagain -> develop/tryagain --- .gitea/workflows/develop -> build.yml | 2 +- equipment-model.a.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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'