From 0655b384f3028ac5461ca029b85887ea6844fed7 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 17 Jan 2025 16:56:42 -0500
Subject: [PATCH] Merging the lint steps into one and deploy steps into
 another.

---
 .../workflows/pr-cloudflare-docker-deploy.yml | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 33d04258..4098595b 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -196,34 +196,11 @@ jobs:
           echo "${pr_index}"
           tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index}
 
-  ansible-config-deply:
-    name: Deploy Service Configs via Ansible
-    runs-on: ubuntu-latest
-    needs: [pr-merge]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: main
-
-      - name: Install Vault
-        uses: cpanato/vault-installer@main
-
-      - name: Install Ansible
-        uses: alex-oleshkevich/setup-ansible@v1.0.1
-        with:
-          version: "2.18.1"
-
-      - name: Run Ansible Playbook
-        uses: euclid1990/actions-ansible@v2
-        with:
-          playbook: ansible/playbook.yml
-          inventory: ansible/inventory
-
-  docker-compose-and-ansible-config-deploy:
+  ansible-config-docker-compose-deploy:
     name: Deploy via Ansible & Docker Compose
     runs-on: ubuntu-latest
-    needs: [ansible-config-deploy]
+    needs: [pr-merge]
+    if: ${{ github.event.pull_request.merged == true }
     env:
       VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }}
       VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}