fix(ci): improve nightly build sync process by fetching both branches and preventing non-fast-forward errors

2026-02-02 13:45:21 +00:00
1 changed files with 8 additions and 3 deletions
@@ -46,11 +46,16 @@ jobs:
      - name: Sync development to nightly
        id: sync
        run: |
-          # Fetch development branch
+          # Fetch both branches to ensure we have the latest remote state
          git fetch origin development
+          git fetch origin nightly

-          # Check if there are differences
-          if git diff --quiet nightly origin/development; then
+          # Sync local nightly with remote nightly to prevent non-fast-forward errors
+          echo "Syncing local nightly with remote nightly..."
+          git reset --hard origin/nightly
+
+          # Check if there are differences between remote branches
+          if git diff --quiet origin/nightly origin/development; then
            echo "No changes to sync from development to nightly"
            echo "has_changes=false" >> $GITHUB_OUTPUT
          else