From ee5b607785513a5544c4c0f3b6a5416a9e580e89 Mon Sep 17 00:00:00 2001
From: mafyuh <mafyuh@noreply.localhost>
Date: Tue, 30 Jul 2024 20:17:39 -0400
Subject: [PATCH] Update .forgejo/workflows/CD.yml

---
 .forgejo/workflows/CD.yml | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml
index 0148346..dd619a4 100644
--- a/.forgejo/workflows/CD.yml
+++ b/.forgejo/workflows/CD.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   deploy:
     if: github.event.pull_request.merged == true
-    runs-on: docker
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -22,30 +22,11 @@ jobs:
           fi
           folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq)
           echo "Modified folders: $folders"
-          echo "::set-output name=folders::$folders"
-
-      - name: Set condition for deployment
-        id: set-condition
-        run: |
-          if [ -z "${{ steps.detect-changes.outputs.folders }}" ]; then
-            echo "No relevant changes detected."
-            echo "::set-output name=continue::false"
-          else
-            echo "Relevant changes detected."
-            echo "::set-output name=continue::true"
-          fi
-
-  conditional-deploy:
-    if: needs.deploy.outputs.continue == 'true'
-    runs-on: docker
-    needs: deploy
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+          echo "::set-output name=folders::$folders"          
 
       - name: Deploy to hosts
         run: |
-          IFS=' ' read -r -a folder_array <<< "${{ needs.deploy.outputs.folders }}"
+          IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}"
           for folder in "${folder_array[@]}"; do
             case $folder in
               arrs)
@@ -102,8 +83,8 @@ jobs:
               -d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \
               "https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/"
 
-            sleep 45  
-            
+            sleep 45  # Delay for 45 seconds before fetching logs
+
             job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id')
             logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json)
             echo "AWX Job Logs for folder: $folder"
@@ -113,4 +94,4 @@ jobs:
             echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')"
             echo "Content:"
             echo "$(echo "$logs" | jq -r '.content')"
-          done
+          done