From 30956efa740c1c488b25353e976103a771342598 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 6 Dec 2024 11:17:10 -0500
Subject: [PATCH] Attempt #7 to trigger gitea-sonarqube-bot; updated merge PR
 step.

---
 .gitea/workflow/build.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflow/build.yaml b/.gitea/workflow/build.yaml
index 4a1694a3..7d8bed34 100644
--- a/.gitea/workflow/build.yaml
+++ b/.gitea/workflow/build.yaml
@@ -78,12 +78,12 @@ jobs:
       #     echo "${{ gitea.event.pull_request.number }}"
       #     tea pr m --repo "${{ gitea.repository.name }}" --message "Automatically merged by GitHub Actions" --output table "${{ gitea.event.pull_request.number }}"
 
-      - name: Merge PR
-        uses: uses: AlexRogalskiy/github-action-git-operation@V2.0.1
+      - name: Git Merge & Push
+        uses: morbalint/git-merge-action@v1.1.0
         with:
-          mode: 'merge-fast-forward'
-          sourceBranch: $ {{ gitea.event.pull_request.head.ref }}
-          targetBranch: 'main'
+          target: 'main'
+          source: ${{ gitea.event.pull_request.head.ref }}
+          dry-run: true
 
       - name: Deploy Docker Compose Changes
         uses: 5eqn/docker-compose-remote-action@v0.0.7