diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 688b845..934c55a 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -60,8 +60,27 @@ jobs: fi echo 'pushed new branch and created pr'; else - if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then - git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; + if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then + + + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned fetch origin #--depth=1 + git -C ../cloned branch -r + git -C ../cloned checkout $DEVELOPMENT_BRANCH || 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 . + git status + git add -A + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" + git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; else echo 'no changes so no push' fi;