From 8be1d98d7e49aa979ffed3ae62ae226dd219b21e Mon Sep 17 00:00:00 2001
From: stoney420 <xxmartinxx1990@gmail.com>
Date: Fri, 27 Jun 2025 18:21:57 +0200
Subject: [PATCH] Update .forgejo/workflows/generate-m3u.yml

---
 .forgejo/workflows/generate-m3u.yml | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/.forgejo/workflows/generate-m3u.yml b/.forgejo/workflows/generate-m3u.yml
index f9d949c..4b66d9a 100644
--- a/.forgejo/workflows/generate-m3u.yml
+++ b/.forgejo/workflows/generate-m3u.yml
@@ -12,6 +12,8 @@ jobs:
     steps:
     - name: 📥 Checkout Repository
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
     - name: 🐍 Set up Python
       uses: actions/setup-python@v5
@@ -73,8 +75,13 @@ jobs:
           echo "❌ No log file found"
         fi
 
-    - name: 💾 Commit changes
+    - name: 💾 Commit and push changes
       run: |
+        echo "=== Preparing to commit ==="
+        
+        # Pull latest changes first to avoid conflicts
+        git pull origin main || echo "Pull failed, continuing anyway"
+        
         # Add files
         git add channels.txt || true
         git add playlist.m3u || true
@@ -84,16 +91,23 @@ jobs:
         
         # Check if anything to commit
         if git diff --staged --quiet; then
-          echo "No changes to commit"
+          echo "ℹ️ No changes to commit"
         else
           CHANNEL_COUNT="0"
           if [ -f playlist.m3u ]; then
             CHANNEL_COUNT=$(grep -c "^#EXTINF" playlist.m3u || echo "0")
           fi
           
+          echo "📝 Committing changes..."
           git commit -m "📺 Updated playlist: $CHANNEL_COUNT channels ($(date '+%Y-%m-%d %H:%M'))"
-          git push
-          echo "✅ Changes committed"
-        fi
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          
+          # Try to push, with retry if needed
+          echo "🚀 Pushing changes..."
+          if ! git push origin main; then
+            echo "⚠️ Push failed, trying to pull and push again..."
+            git pull origin main --rebase || true
+            git push origin main || echo "❌ Push failed again - manual intervention may be needed"
+          fi
+          
+          echo "✅ Changes committed and pushed"
+        fi
\ No newline at end of file