diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 47e9d07..d7b4c25 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -17,8 +17,8 @@ jobs: with: node-version: '20' - run: git fetch - - name: log - run: git log -10 + - name: actor + run: echo ${{ github.actor }} - uses: http://sigyl.com:3000/actions/batch2yaml@master with: action: yml @@ -34,7 +34,7 @@ jobs: CI_COMMIT_AUTHOR: Continuous Integration run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" + git config --global user.email "${{ env.CI_COMMIT_EMAIL }}" git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" - name: status @@ -44,7 +44,7 @@ jobs: run: | git branch -r echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) - - name: diff + - name: push env: CI_COMMIT_MESSAGE: converted to yml for review. CI_COMMIT_AUTHOR: Continuous Integration @@ -67,8 +67,9 @@ jobs: git status git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ env.CI_COMMIT_EMAIL }}" 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; @@ -96,6 +97,8 @@ jobs: mv ../cloned/.git . git status git add -A + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ env.CI_COMMIT_EMAIL }}" git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; else diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 8532d64..e4c9eb8 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -35,7 +35,7 @@ jobs: firstString=${{ github.ref_name }} secondString="build" echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} - - name: GIT commit and push all changed files + - name: push env: CI_COMMIT_MESSAGE: Development branch built to xml. CI_COMMIT_AUTHOR: Continuous Integration @@ -63,6 +63,8 @@ jobs: mv ../cloned/.git . git status git add -A + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ env.CI_COMMIT_EMAIL }}" git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git push origin HEAD:${{ env.BUILD_BRANCH }} else diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index ba3f6fc..0f10aa6 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -4,6 +4,7 @@ on: pull_request: types: - closed + - deleted branches: - 'master' diff --git a/equipment-model.a.yml b/equipment-model.a.yml index 72f103f..baf9791 100644 --- a/equipment-model.a.yml +++ b/equipment-model.a.yml @@ -137,7 +137,7 @@ - RevertSignatureTemplateName: null - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh.... - RecipeApprovalStep: - - Name: Review Recipe + - Name: Reviedcdw Recipe - Id: '-3' - StepOrder: '3' - Required: '0'