refactor: rename sync workflow and enhance branch synchronization logic

Author: kevinccbsg

.github/workflows/sync-branches.yml

@@ -1,27 +1,46 @@
-name: Sync Main to Staging
+name: Sync branches
 
 on:
   push:
     branches:
       - main
 
 permissions:
-  contents: write
+  contents: write  # Necesario para que el push funcione
 
 jobs:
-  sync:
+  deploy:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout staging branch
-        uses: actions/checkout@v3
+      # 1️⃣ Clonamos el repo con la deploy key y todo el historial (fetch-depth: 0 es clave)
+      - name: Checkout main
+        uses: actions/checkout@v4
         with:
-          ref: staging
-          # The GITHUB_TOKEN is automatically used here due to the `permissions` key
-      - name: Configure Git
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
+          fetch-depth: 0
+
+      # 2️⃣ Configuramos identidad del bot
+      - name: Setup Git
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-      - name: Merge main into staging
+          git config user.name "Staging Sync Bot"
+          git config user.email "[email protected]"
+
+      # 3️⃣ Sincronizamos staging con main solo si es fast-forward posible
+      - name: Push to staging
         run: |
-          git pull origin main
-          git push origin staging
+          # Traemos lo último de remoto
+          git fetch origin
+
+          # Si la rama staging existe, la usamos; si no, la creamos desde remoto
+          git checkout staging || git checkout -b staging origin/staging
+
+          # Intentamos fast-forward desde main
+          if git merge --ff-only origin/main; then
+            echo "✅ Fast-forward successful. Pushing to staging..."
+            git push origin staging
+          else
+            echo "❌ No fast-forward possible. Manual intervention required."
+            # Si quieres que simplemente no haga nada, comenta la siguiente línea
+            exit 1
+          fi