From 3ac572b8121b9e171f1fa2e18212108bd8ce7b17 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 12:52:24 +0000 Subject: [PATCH] build/1003 -> develop/1003 --- .gitea/workflows/build->develop.yml | 14 +++++--------- .gitea/workflows/develop -> build.yml | 6 ++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index ae68c76..834ec41 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -28,19 +28,15 @@ jobs: firstString=${{ github.ref_name }} secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} - - name: commit - env: - CI_COMMIT_MESSAGE: converted to yml for review. - CI_COMMIT_AUTHOR: Continuous Integration + - name: config + run: | + git config --global user.name "${{ github.actor }}" + git config --global user.email "noreply@noreply.noreply" + - name: commit run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "${{ env.CI_COMMIT_EMAIL }}" git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" - name: status - env: - CI_COMMIT_MESSAGE: converted to yml for review. - CI_COMMIT_AUTHOR: Continuous Integration run: | git branch -r echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index c9441f8..9c6fc65 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -32,6 +32,10 @@ jobs: echo ::set-env name=PR::$PR rm ./tea - run: git fetch + - name: config + run: | + git config --global user.name "${{ github.actor }}" + git config --global user.email "noreply@noreply.noreply" - name: get build branch name run: | firstString=${{ github.ref_name }} @@ -39,8 +43,6 @@ jobs: echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} - name: push run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - 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 }}