diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index d7b4c25..e4afafb 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: printenv - 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,6 @@ 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 }}; @@ -97,8 +92,6 @@ 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 e4c9eb8..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.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/README.md b/README.md index 2a040a1..c8370f3 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,6 @@ push from development to format branch on format-branch pull, xml -> yml, push to product-development and PR - - - ### FTBatch development pc on development branch ```sh