From 83e4c7b03de53601157401f76b7d5d9bf190fcd7 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 01:10:43 +0100
Subject: [PATCH] jjjjj

---
 ...convert-build-to-yml.yml => build->develop.yml} | 14 +++++++++++++-
 ...ild-develop-branch.yml => develop -> build.yml} |  0
 .../{convert-to-yml.yml => format->develop.yml}    |  0
 .../{convert-to-xml.yml => tag->deploy.yml}        |  0
 4 files changed, 13 insertions(+), 1 deletion(-)
 rename .gitea/workflows/{convert-build-to-yml.yml => build->develop.yml} (64%)
 rename .gitea/workflows/{build-develop-branch.yml => develop -> build.yml} (100%)
 rename .gitea/workflows/{convert-to-yml.yml => format->develop.yml} (100%)
 rename .gitea/workflows/{convert-to-xml.yml => tag->deploy.yml} (100%)

diff --git a/.gitea/workflows/convert-build-to-yml.yml b/.gitea/workflows/build->develop.yml
similarity index 64%
rename from .gitea/workflows/convert-build-to-yml.yml
rename to .gitea/workflows/build->develop.yml
index 4fc5813..452a013 100644
--- a/.gitea/workflows/convert-build-to-yml.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -37,6 +37,18 @@ jobs:
           git config --global user.email "username@users.noreply.github.com"
           git add -A
           git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
-          git checkout ${{ env.DEVELOPMENT_BRANCH }}
+          git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
           git merge --squash ${{ github.ref_name }}
           git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
+      - name: make pull request
+        #git fetch
+        #  git merge origin/master --allow-unrelated-histories --strategy-option=ours
+        #  git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
+        run: |
+          curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
+          chmod +x ./tea
+          ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
+          if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then
+            ./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}"
+          fi
+          rm ./tea
diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/develop -> build.yml
similarity index 100%
rename from .gitea/workflows/build-develop-branch.yml
rename to .gitea/workflows/develop -> build.yml
diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/format->develop.yml
similarity index 100%
rename from .gitea/workflows/convert-to-yml.yml
rename to .gitea/workflows/format->develop.yml
diff --git a/.gitea/workflows/convert-to-xml.yml b/.gitea/workflows/tag->deploy.yml
similarity index 100%
rename from .gitea/workflows/convert-to-xml.yml
rename to .gitea/workflows/tag->deploy.yml