diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 076b011..d319969 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -39,23 +39,7 @@ jobs: git checkout -b ${{ env.BUILD_BRANCH }} git merge --squash ${{ github.ref_name }} if [[ $(git diff origin/${{ env.BUILD_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 $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_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.BUILD_BRANCH }} " + git rebase origin/${{ env.BUILD_BRANCH }} git push origin HEAD:${{ env.BUILD_BRANCH }} else echo 'no changes so no push'