From f6283cfdaebe15430848a135380fea26bd696c4a Mon Sep 17 00:00:00 2001
From: thehack904 <35552907+thehack904@users.noreply.github.com>
Date: Mon, 6 Oct 2025 18:16:39 -0500
Subject: [PATCH 1/2] Update main.yml

---
 .github/workflows/main.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 89a122e..de02219 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,24 +2,18 @@ name: RetroIPTVGuide CI/CD
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - dev
+      - feature/**
   workflow_dispatch:
 
 env:
   PYTHON_VERSION: "3.12"
-  DEPLOY_PATH: "/opt/retroiptvguide"
 
 jobs:
-  clone:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Clone confirmation
-        run: echo "✅ Repository cloned successfully."
-
   build:
     runs-on: ubuntu-latest
-    needs: clone
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -49,12 +43,14 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: test
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/dev'
     steps:
       - uses: actions/checkout@v4
-      - name: Simulate Deployment
-        run: |
-          echo "🚀 Simulating deployment to ${{ env.DEPLOY_PATH }}"
-          mkdir -p ${{ env.DEPLOY_PATH }}
-          cp -r . ${{ env.DEPLOY_PATH }}/
-
+      - name: Deploy to dev server
+        uses: appleboy/scp-action@v0.1.4
+        with:
+          host: ${{ secrets.DEPLOY_HOST }}
+          username: ${{ secrets.DEPLOY_USER }}
+          key: ${{ secrets.DEPLOY_SSH_KEY }}
+          source: "."
+          target: "/opt/retroiptvguide-dev"

From 314eb694b1314dd8831d12b52b93c0c13e895925 Mon Sep 17 00:00:00 2001
From: thehack904 <35552907+thehack904@users.noreply.github.com>
Date: Tue, 7 Oct 2025 09:28:41 -0500
Subject: [PATCH 2/2] Update main.yml

---
 .github/workflows/main.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index de02219..d7226fc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,17 +40,17 @@ jobs:
           echo "🧪 Running syntax and basic runtime tests..."
           python -m unittest discover -s tests || echo "No tests found, skipping."
 
-  deploy:
-    runs-on: ubuntu-latest
-    needs: test
-    if: github.ref == 'refs/heads/dev'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Deploy to dev server
-        uses: appleboy/scp-action@v0.1.4
-        with:
-          host: ${{ secrets.DEPLOY_HOST }}
-          username: ${{ secrets.DEPLOY_USER }}
-          key: ${{ secrets.DEPLOY_SSH_KEY }}
-          source: "."
-          target: "/opt/retroiptvguide-dev"
+#  deploy:
+#    runs-on: ubuntu-latest
+#    needs: test
+#    if: github.ref == 'refs/heads/dev'
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Deploy to dev server
+#        uses: appleboy/scp-action@v0.1.4
+#        with:
+#          host: ${{ secrets.DEPLOY_HOST }}
+#          username: ${{ secrets.DEPLOY_USER }}
+#          key: ${{ secrets.DEPLOY_SSH_KEY }}
+#          source: "."
+#          target: "/opt/retroiptvguide-dev"