From 3d34a9db476d6eac02d6ec37fd3246725224d5e9 Mon Sep 17 00:00:00 2001 From: giles Date: Sun, 22 Oct 2023 01:56:22 +0100 Subject: [PATCH] kkkkkkkkkkkksssssssssssssswdwdwdw --- .gitea/workflows/convert-to-yml.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index fbe3088..926ee92 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -24,13 +24,13 @@ jobs: - name: clone run: | git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - git -C ../cloned remote -v - git -C ../cloned push origin HEAD mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned rm -rf ../cloned/.git mv ../.git ../cloned + rm -rf . + mv ../cloned . - name: GIT commit and push all changed files env: CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts @@ -39,10 +39,10 @@ jobs: git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" git config pull.rebase false - git -C ../cloned checkout -b ${{ env.PRODUCTION_BRANCH }} - git -C ../cloned add -A - git -C ../cloned commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" - git -C ../cloned push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} + git checkout -b ${{ env.PRODUCTION_BRANCH }} + git add -A + git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" + git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} - name: make pull request #git fetch # git merge origin/master --allow-unrelated-histories --strategy-option=ours