From d53db6f67d578fcda01c884694a539ccce6f5790 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 12 Jan 2025 13:13:46 -0500
Subject: [PATCH] Changing order of steps in trigger job.

---
 .gitea/workflows/deployment.yml | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index d3edf346..8a2835e8 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -159,6 +159,26 @@ jobs:
     needs: [generate-readme, docker-compose-test, regenerate-readme]
     runs-on: ubuntu-latest
     steps:
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}'
+          notification_title: 'Ready to Deploy'
+          notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}'
+          
+      - name: Trigger Deployment
+        id: deploy-trigger
+        uses: macnev2013/manual-approval@v1.0.18
+        with:
+          secret: ${{ github.TOKEN }}
+          approvers: Trez.One
+          minimum-approvals: 1
+          approval-wait: 600
+          issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}'
+          issue-body: |
+            "Autobots, roll out!"
+
       - name: Install tea
         uses: supplypike/setup-bin@v4
         with:
@@ -182,26 +202,6 @@ jobs:
             if [ "${pr_state}" == "merged" ]; then
               break
 
-      - name: Gotify Notification
-        uses: eikendev/gotify-action@master
-        with:
-          gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}'
-          gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}'
-          notification_title: 'Ready to Deploy'
-          notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}'
-
-      - name: Trigger Deployment
-        id: deploy-trigger
-        uses: macnev2013/manual-approval@v1.0.18
-        with:
-          secret: ${{ github.TOKEN }}
-          approvers: Trez.One
-          minimum-approvals: 1
-          approval-wait: 600
-          issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}'
-          issue-body: |
-            "Autobots, roll out!"
-
   # docker-compose-deploy:
   #   name: Merge and Deploy
   #   runs-on: ubuntu-latest