From 868af449f41a80fc8023fae963bdf1d93d4ec9eb Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 27 Dec 2024 13:10:36 -0500
Subject: [PATCH] Added PR merge.

---
 .gitea/workflows/deployment.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index c44b20b0..97e17996 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -10,8 +10,6 @@ jobs:
   check-and-create-pr:
     name: Check and Create PR
     runs-on: ubuntu-latest
-    outputs:
-      pr_index: ${{ steps.check-and-create-pr.outputs.pr_index }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -25,8 +23,6 @@ jobs:
           tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open|closed|merged' | awk -F, '{print $3}' | sed -e 's|"||g')
           echo "pr_state=$(echo ${pr_state})" >> "$GITHUB_OUTPUT"
-          pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open|closed|merged' | awk -F, '{print $1}' | sed -e 's|"||g')
-          echo "pr_index=$(echo ${pr_index})" >> "$GITHUB_OUTPUT"
 
       - name: Create PR
         if: steps.list-prs.outputs.pr_state == 'closed'
@@ -37,12 +33,15 @@ jobs:
           assignee: ${{ gitea.actor }}
 
   docker-compose-test:
+    name: Docker Compose Test
+    needs: [create-pr]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Generate ephemeral .env compose-file
+      - name: Generate ephemeral .env compose file
+        id: generate-env-file-pr
         run: |
           echo "${{ secrets.RINOA_ENV }}" > .env
 
@@ -55,4 +54,20 @@ jobs:
           up: true
           up-opts: --dry-run -d --remove-orphans
         env:
-          DOCKER_HOST: tcp://dockerproxy:2375
\ No newline at end of file
+          DOCKER_HOST: tcp://dockerproxy:2375
+
+  merge-pr:
+    runs-on: ubuntu-latest
+    needs: [docker-compose-test]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Tea CLI Setup & PR Merge
+        run: |
+          curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
+          chmod +x /usr/local/bin/tea
+          echo "Merging PR..."
+          tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
+          pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' | sed -e 's|"||g')
+          tea pr m --repo ${{ github.repository }} --title "Auto Merge" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}
\ No newline at end of file