.

.gitea/workflows/build-develop-branch.yml

@@ -27,6 +27,7 @@ jobs:
           ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
           echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1)
           rm ./tea
+      - run: git fetch
       - name: get build branch name
         run: |
           firstString=${{ github.ref_name }}
@@ -39,9 +40,10 @@ jobs:
         run: |
           git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
           git config --global user.email "username@users.noreply.github.com"
-          git checkout -b ${{ env.BUILD_BRANCH }}
           git add -A
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml"
+          git checkout -b ${{ env.BUILD_BRANCH }}
+          get merge --squash ${{ github.ref_name }}
           git push origin HEAD:${{ env.BUILD_BRANCH }}
 
       - name: make pull request comment

.gitea/workflows/convert-build-to-yml.yml

@@ -16,10 +16,7 @@ jobs:
       - uses: http://sigyl.com:3000/actions/setup-node@v3
         with:
           node-version: '20'
-      - name: fetch
-        run: |
-          git fetch origin --depth=10
-          git pull
+      - run: git fetch
       - name: log
         run: git log -10
       - uses: http://sigyl.com:3000/actions/batch2yaml@master
@@ -40,4 +37,6 @@ jobs:
           git config --global user.email "username@users.noreply.github.com"
           git add -A
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
+          git checkout ${{ env.DEVELOPMENT_BRANCH }}
+          git merge --squash ${{ github.ref_name }}
           git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}