diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index d7b4c25..9344a28 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -18,7 +18,7 @@ jobs: node-version: '20' - run: git fetch - name: actor - run: echo ${{ github.actor }} + run: echo ${{ github.event.pusher.email }} - uses: http://sigyl.com:3000/actions/batch2yaml@master with: action: yml @@ -45,9 +45,6 @@ jobs: git branch -r echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) - name: push - env: - CI_COMMIT_MESSAGE: converted to yml for review. - 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 @@ -67,8 +64,8 @@ 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 config --global user.name "${{ github.event.pusher.name }}" + git config --global user.email "${{ github.event.pusher.email }}" git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; @@ -97,8 +94,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 config --global user.name "${{ github.event.pusher.name }}" + git config --global user.email "${{ github.event.pusher.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 e4c9eb8..9dac017 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -63,8 +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 config --global user.name "${{ github.event.pusher.name }}" + git config --global user.email "${{ github.event.pusher.email }}" git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git push origin HEAD:${{ env.BUILD_BRANCH }} else