From 915ff9dc6e30d17c2959bd6f318ce65fe0e94e69 Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 16:31:39 +0100
Subject: [PATCH] .

---
 .gitea/workflows/build->develop.yml   | 18 ++----------------
 .gitea/workflows/develop -> build.yml | 16 +---------------
 .gitea/workflows/pr-closed.yml        | 14 --------------
 3 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 87c6d53..0fde989 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -43,7 +43,7 @@ jobs:
       - name: push
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            git rebase origin/master --strategy-option ours
+            git rebase origin/master --strategy-option ours --force-rebase
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
@@ -59,21 +59,7 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             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 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 add -A
-              git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+              git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours --force-rebase
               git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             else
               echo 'no changes so no push'
diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index 83ddfe8..832e8ed 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -43,21 +43,7 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             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 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 add -A
-              git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
+              git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours --force-rebase
               git push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'
diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml
index 8cce369..0f10aa6 100644
--- a/.gitea/workflows/pr-closed.yml
+++ b/.gitea/workflows/pr-closed.yml
@@ -36,20 +36,6 @@ jobs:
       - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
         with:
           token: ${{ secrets.BOT_TOKEN }}
-      - name: Bump version and push tag
-        id: tag_version
-        uses: miguelfito/github-bump-and-tag-action@v1
-        with:
-          github_token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Create a GitHub release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-        with:
-          tag_name: ${{ steps.tag_version.outputs.new_tag }}
-          release_name: Release ${{ steps.tag_version.outputs.new_tag }}
-          body: "wahey"
       - name: delete develop branch
         id: delete_develop_branch
         run: git push origin --delete ${{ github.head_ref }}