Adding PR merge step.

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

@@ -129,7 +129,6 @@ jobs:
             -d "$payload" \
             "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
 
-  # Job 3: Merge PR if Quality Gate passes
   dry-run-merge-pr:
     runs-on: ubuntu-latest
     needs: sonarqube-analysis
@@ -153,19 +152,27 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      # - name: Merge PR in Gitea
+      - name: Merge PR
-      #   uses: prasiman/gocurl@v1
+        env:
-      #   with:
+          PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-      #     url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
+        run: |
-      #     method: "POST"
+          merge_response=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${PR_INDEX}/merge -s \
-      #     headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
+              -X 'POST' \
-      #     params: >-
+              -H 'Accept: application/json' \
-      #       {
+              -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \
-      #         "Do": "merge",
+              -H 'Content-Type: application/json' \
-      #         "delete_branch_after_merge": true,
+              -d '{
-      #         "force_merge": true,
+                "Do": "merge",
-      #         "merge_when_checks_succeed": true
+                "delete_branch_after_merge": true,
-      #       }
+                "force_merge": true,
+                "merge_when_checks_succeed": true
+              }' -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
+      - name: Confirm Merge
-      #   run: echo "PR has been successfully merged into main."
+        run: echo "PR has been successfully merged into main."