diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index 14bb3d1..549e1fa 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -26,19 +26,20 @@ jobs: secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/} git status - #- name: clone - # run: | - # git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - # mv ../cloned/.git .. - # rm -rf ../cloned - # cp -r . ../cloned - # rm -rf ../cloned/.git - # mv ../.git ../cloned - # mv .git/config ../cloned/.git - # rm -r ./* - # rm -r .git - # mv ../cloned/* . - # mv ../cloned/.git . + - name: clone + run: | + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned checkout -b $DEVELOPMENT_BRANCH + mv ../cloned/.git .. + rm -rf ../cloned + cp -r . ../cloned + rm -rf ../cloned/.git + mv ../.git ../cloned + mv .git/config ../cloned/.git + rm -r ./* + rm -r .git + mv ../cloned/* . + mv ../cloned/.git . - name: GIT commit and push all changed files env: CI_COMMIT_MESSAGE: converted to yml for review. @@ -46,12 +47,6 @@ jobs: run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" - git fetch - git add -A - git stash - git checkout master - git checkout -b ${{ env.DEVELOPMENT_BRANCH }} - git stash pop git add -A git status git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "