workout bro

Author: tanu

.github/workflows/build.yml

@@ -97,7 +97,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Full history fetch karo for clean git operations
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
 
       # Create build directory
       - name: Create build directory
@@ -132,36 +133,50 @@ jobs:
           path: build-temp/
         continue-on-error: false
 
-      # Move files to build directory (artifacts download with nested folder structure)
+      # Move files to build directory
       - name: Organize binaries
         run: |
-          # List kya download hua
           echo "Downloaded files:"
           find build-temp/ -type f
           
-          # Sab files ko build/ mein move karo
+          # Copy all binaries to build folder
           find build-temp/ -type f -name "cmdo*" -exec cp {} build/ \;
           
-          # Verify
           echo "Final build directory:"
           ls -lh build/
       
-      # Commit aur push - ek saath saari files
+      # Commit aur push - proper way
       - name: Commit and push all binaries
         run: |
+          # Git config
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           
-          # Latest changes pull karo
-          git pull origin main --rebase
+          # Pehle latest changes pull karo (before any staging)
+          git pull origin main
           
-          # Build folder add karo
+          # Ab files add karo
           git add build/
           
-          # Check if there are changes
+          # Check if there are changes to commit
           if git diff --staged --quiet; then
             echo "No changes to commit"
           else
+            echo "Committing changes..."
             git commit -m "Build: Update all binaries [skip ci]"
-            git push origin main
+            
+            # Push with retry logic (in case of race conditions)
+            for i in {1..3}; do
+              if git push origin main; then
+                echo "Push successful!"
+                exit 0
+              else
+                echo "Push failed, retrying... ($i/3)"
+                git pull origin main --rebase
+                sleep 2
+              fi
+            done
+            
+            echo "Failed to push after 3 attempts"
+            exit 1
           fi