Small fixes.

.gitea/workflows/branch-sonarscan-pr-merge.yml

@@ -155,24 +155,14 @@ jobs:
       - name: Merge PR
         env:
           PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-        run: |
+        uses: Frozen-Tapestry/docker-run-action@v6
-          merge_response=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${PR_INDEX}/merge -s \
+        with:
-              -X 'POST' \
+          image: tgerczei/tea
-              -H 'Accept: application/json' \
+          run: |
-              -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \
+            tea login add --token ${{ secrets.GITHUB_TOKEN }} --name github
-              -H 'Content-Type: application/json' \
+          env: |
-              -d '{
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                "Do": "merge",
+            GITEA_USER="gitea-sonarqube-bot"
-                "delete_branch_after_merge": true,
+            GITEA_SERVER_URL=${{ vars.RINOA_GITEA_URL }}
-                "force_merge": true,
+            GITEA_SERVER_TOKEN=${{ secrets.BOT_GITEA_TOKEN }}
-                "merge_when_checks_succeed": true
+            DOCKER_HOST: tcp://dockerproxy:2375
-              }' -w "%{http_code}")
-          if [ "${merge_response}" -eq "200" ]; then
-            echo "PR has been successfully merged into main."
-          else
-            echo "Failed to merge PR. Response code: {$merge_response}"
-            exit 1
-          fi
-
-      - name: Confirm Merge
-        run: echo "PR has been successfully merged into main."