From 2c7937596c995162132a747238dbfa2c67f5036b Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 15:02:28 +0100
Subject: [PATCH] .....

---
 .gitea/workflows/develop -> build.yml | 46 ++++++++++++++-------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index b6b5e7a..f5c967a 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -40,29 +40,31 @@ jobs:
         run: |
           git add -A
           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 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 }}
+          if [[ $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
+            git push origin;
           else
-            echo 'no changes so no push'
+            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;
           fi;
       - name: make PR
         run: |