From d612b3d9c1538c2751d5b836e9aaad9cd513b8d3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 10:46:58 -0500
Subject: [PATCH 1/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index 6824075f..9bf65e10 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -181,14 +181,7 @@ jobs:
           tea login default gitea-rinoa
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
           tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}
-          echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT
 
-      - name: Wait for PR to be merged
-        run: |
-          while true; do
-            pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g')
-            if [ "${pr_state}" == "merged" ]; then
-              break
 
   docker-compose-deploy:
     name: Deploy via Docker Compose

From b56a0eec39ada63c0f58efa2af4728f8dbfdf0fa Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 10:49:13 -0500
Subject: [PATCH 2/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index 9bf65e10..a23d9959 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -28,6 +28,7 @@ jobs:
           tea login default gitea-rinoa
           echo "Checking if PR exists for ${{ github.ref_name }}"
           pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g')
+          echo "PR state: ${pr_state}"
           if [ "${pr_state}" != 'open' ]; then
             echo "PR does not exist, creating..."
             tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}"

From 7e31e2363f06cbc3a32fddb2fade6716c09a7426 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 10:50:23 -0500
Subject: [PATCH 3/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index a23d9959..5f12f5ce 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -27,6 +27,7 @@ jobs:
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
           echo "Checking if PR exists for ${{ github.ref_name }}"
+          tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
           pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g')
           echo "PR state: ${pr_state}"
           if [ "${pr_state}" != 'open' ]; then

From 7a4ab12b9a3ad3e2a3e934390d3e5e2269647e13 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 10:51:52 -0500
Subject: [PATCH 4/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index 5f12f5ce..ed15f2b5 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -30,7 +30,7 @@ jobs:
           tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
           pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g')
           echo "PR state: ${pr_state}"
-          if [ "${pr_state}" != 'open' ]; then
+          if [ -z "${pr_state}" ]; then
             echo "PR does not exist, creating..."
             tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}"
           elif [ "${pr_state}" = 'open' ]; then

From e3086057f27fe5f8e5ff66d3fd51b47e1d903cd8 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 10:58:20 -0500
Subject: [PATCH 5/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index ed15f2b5..11fbb169 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -28,7 +28,7 @@ jobs:
           tea login default gitea-rinoa
           echo "Checking if PR exists for ${{ github.ref_name }}"
           tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
-          pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g')
+          pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | awk -F, '{print $4}' | sed -e 's|"||g')
           echo "PR state: ${pr_state}"
           if [ -z "${pr_state}" ]; then
             echo "PR does not exist, creating..."

From 692d092a012b4ff35d2cffcfaf29226b8e952bf4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 10:59:36 -0500
Subject: [PATCH 6/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index 11fbb169..c6d77147 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -28,7 +28,7 @@ jobs:
           tea login default gitea-rinoa
           echo "Checking if PR exists for ${{ github.ref_name }}"
           tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
-          pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | awk -F, '{print $4}' | sed -e 's|"||g')
+          pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | head -1 |awk -F, '{print $4}' | sed -e 's|"||g')
           echo "PR state: ${pr_state}"
           if [ -z "${pr_state}" ]; then
             echo "PR does not exist, creating..."

From 4af14ddc69d9b4adc0dc58001e6efd933bad9c86 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 11:01:15 -0500
Subject: [PATCH 7/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index c6d77147..e349911c 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -28,7 +28,7 @@ jobs:
           tea login default gitea-rinoa
           echo "Checking if PR exists for ${{ github.ref_name }}"
           tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
-          pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | head -1 |awk -F, '{print $4}' | sed -e 's|"||g')
+          pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | head -1 |awk -F, '{print $4}' | sed -e 's|"||g')
           echo "PR state: ${pr_state}"
           if [ -z "${pr_state}" ]; then
             echo "PR does not exist, creating..."

From 4dde7636e3e4a9c57d1868a00d44b05cb1ed42f4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Tue, 14 Jan 2025 11:02:24 -0500
Subject: [PATCH 8/8] Taking out merge pause.

---
 .gitea/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index e349911c..63e58680 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -30,7 +30,7 @@ jobs:
           tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
           pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | head -1 |awk -F, '{print $4}' | sed -e 's|"||g')
           echo "PR state: ${pr_state}"
-          if [ -z "${pr_state}" ]; then
+          if [ "${pr_state}" != 'open' ]; then
             echo "PR does not exist, creating..."
             tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}"
           elif [ "${pr_state}" = 'open' ]; then