debloat and add smart waiting for deploy.yml(for infra.yml)

Author: aaren17

.github/workflows/deploy.yml

@@ -1,18 +1,17 @@
-name: "App Deployment"
+name: "CI/CD Pipeline"
 
 on:
   push:
-    branches:
-      - "main"
+    branches: ["main"]
 
 jobs:
-  build-and-deploy:
+  deploy:
     runs-on: ubuntu-latest
     steps:
+      # 1. SETUP & BUILD
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      # CI: Build image while server is still booting
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -24,37 +23,36 @@ jobs:
           docker build -t aaren17/devops-demo:latest .
           docker push aaren17/devops-demo:latest
 
-      # NEW: Wait for the server to finish installing Docker
-      - name: Wait for Server Readiness
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.EC2_HOST }}
-          username: ubuntu
-          key: ${{ secrets.EC2_SSH_KEY }}
-          command_timeout: 10m
-          script: |
-            # This waits until the user_data script is done
-            sudo cloud-init status --wait
+      # 2. SMART WAIT (Replaces sleep 60)
+      - name: Wait for SSH Reachability
+        timeout-minutes: 2
+        run: |
+          while ! nc -z ${{ secrets.EC2_HOST }} 22; do
+            sleep 5
+          done
 
-      # CD: Teleport file with a longer timeout to prevent i/o errors
-      - name: Copy Compose File
+      # 3. DEPLOY FILES
+      - name: Copy Files
         uses: appleboy/scp-action@v0.1.7
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ubuntu
           key: ${{ secrets.EC2_SSH_KEY }}
-          timeout: 300s # Patiently waits for the SSH port to open
           source: "docker-compose.yml,prometheus.yml"
           target: "/home/ubuntu/"
 
-      # REFRESH
-      - name: Remote Docker Update
+      # 4. START APPLICATION
+      - name: Deploy App
         uses: appleboy/ssh-action@v1.0.3
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ubuntu
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
+            # Ensure Docker installation is actually finished
+            sudo cloud-init status --wait
+            
+            # Run the app
             cd /home/ubuntu
             docker compose pull
-            docker compose up -d
+            docker compose up -d