diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index ad03f37..6a8b544 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.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 @@ -67,8 +67,9 @@ jobs: git status git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + 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 "${{ env.CI_COMMIT_AUTHOR }}" + 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 940be41..6c7b0b5 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -40,12 +40,6 @@ jobs: CI_COMMIT_MESSAGE: Development branch built to xml. 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 add -A - git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " - git checkout -b ${{ env.BUILD_BRANCH }} - git merge --squash ${{ github.ref_name }} if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch origin #--depth=1 @@ -63,6 +57,8 @@ jobs: mv ../cloned/.git . git status git add -A + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + 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