From 5ef777109ecd1d181087db112f700d020b219ffa Mon Sep 17 00:00:00 2001 From: giles Date: Sun, 22 Oct 2023 10:32:04 +0100 Subject: [PATCH] hopefully this will sort it --- .gitea/workflows/convert-to-yml.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index ddcc618..f080f99 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -35,19 +35,6 @@ jobs: converted from batch" git merge origin/master --strategy-option=ours --allow-unrelated git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - - - name: GIT commit and push all changed files - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - 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 checkout -b ${{ env.DEVELOPMENT_BRANCH }} - git add -A - git status - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" - git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - name: make pull request #git fetch # git merge origin/master --allow-unrelated-histories --strategy-option=ours