From 2ae432085d8e0536c66ab42873aefd1948793f43 Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 09:09:20 +0000 Subject: [PATCH] format/another -> develop/another --- .gitea/workflows/build->develop.yml | 24 ++++++++++++++++++++++-- equipment-model.a.yml | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 4b2f9bc..c4e889b 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -28,7 +28,7 @@ jobs: firstString=${{ github.ref_name }} secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} - - name: GIT commit diff + - name: commit env: CI_COMMIT_MESSAGE: converted to yml for review. CI_COMMIT_AUTHOR: Continuous Integration @@ -37,4 +37,24 @@ jobs: git config --global user.email "username@users.noreply.github.com" git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" - ggit diff HEAD origin/${{ env.DEVELOPMENT_BRANCH }} \ No newline at end of file + - name: status + env: + CI_COMMIT_MESSAGE: converted to yml for review. + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git status + - name: diff + env: + CI_COMMIT_MESSAGE: converted to yml for review. + CI_COMMIT_AUTHOR: Continuous Integration + run: git diff HEAD origin/${{ env.DEVELOPMENT_BRANCH }} + - name: push + env: + CI_COMMIT_MESSAGE: converted to yml for review. + CI_COMMIT_AUTHOR: Continuous Integration + run: | + if [[ $(git diff HEAD origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then + git push origin HEAD:origin/${{ env.DEVELOPMENT_BRANCH }}; + else + echo 'no changes so no push' + fi \ No newline at end of file diff --git a/equipment-model.a.yml b/equipment-model.a.yml index 437d976..e6687b6 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 thatcdcscsvdsvdsvsdit is ready for redcdview.s...gfhhh.... + - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsdit is ready for v vredcdview.s...gfhhh.... - RecipeApprovalStep: - Name: Review Recipe - Id: '-3'