removed junk

ml files

.gitea/workflows/build->develop.yml

@@ -43,10 +43,8 @@ jobs:
       - name: push
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            echo rebasing with master
+            git rebase origin/master --strategy-option ours
             git log -5
-            git status
-            git rebase -Xtheirs origin/master #--strategy-option ours
             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;
@@ -61,22 +59,21 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
-              #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 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 push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             else
               echo 'no changes so no push'

.gitea/workflows/develop -> build.yml

@@ -43,22 +43,21 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
-              #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 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 push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'

.gitea/workflows/pr-closed.yml

@@ -36,6 +36,20 @@ 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 }}