.

.gitea/workflows/build->develop.yml

@@ -50,6 +50,12 @@ jobs:
           CI_COMMIT_AUTHOR: Continuous Integration
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
+
+
+
+
+
+          
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
@@ -60,8 +66,25 @@ 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;

.gitea/workflows/develop -> build.yml

@@ -27,6 +27,7 @@ jobs:
           ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
           pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1)
           export PR="${pr//[\"\'\`]/}"
+          echo ::set-env name=PR::$PR
           rm ./tea
       - run: git fetch
       - name: get build branch name
@@ -45,8 +46,25 @@ jobs:
           git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
           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 push -f origin HEAD:${{ env.BUILD_BRANCH }}
+          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 push origin HEAD:${{ env.BUILD_BRANCH }}
           else
             echo 'no changes so no push'
           fi;