From 1437031ab3af4aea01f06e4aca846de0a6aa7249 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 13:40:02 +0100 Subject: [PATCH] ... --- .gitea/workflows/build->develop.yml | 4 ---- .gitea/workflows/develop -> build.yml | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 5c1b1de..e4afafb 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -64,8 +64,6 @@ jobs: git status git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A - 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 }}; @@ -94,8 +92,6 @@ jobs: mv ../cloned/.git . git status git add -A - 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 9dac017..ed5198a 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -36,12 +36,9 @@ jobs: secondString="build" echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} - name: push - env: - 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 config --global user.email "${{ env.CI_COMMIT_EMAIL }}" git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git checkout -b ${{ env.BUILD_BRANCH }} @@ -63,8 +60,6 @@ jobs: mv ../cloned/.git . git status git add -A - 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