From 33a19775e47918cdc3c5aa181e2cf577b5ddf843 Mon Sep 17 00:00:00 2001
From: batch-bot <batch-bot@noreply.sigyl.com>
Date: Mon, 23 Oct 2023 16:44:13 +0000
Subject: [PATCH] develop/rebase-20 -> build/rebase-20

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

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 40bb037..578dd61 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -63,6 +63,7 @@ jobs:
             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
@@ -74,6 +75,7 @@ jobs:
               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 }};
diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index 83ddfe8..8af12e1 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -45,6 +45,7 @@ jobs:
             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
@@ -56,6 +57,7 @@ jobs:
               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 }}
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 }}