chore: update ci

Author: Minh141120

.github/workflows/upstream-sync.yml

@@ -102,16 +102,6 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.PAT_SERVICE_ACCOUNT }}
       run: |
-        # Check if PR can be merged
-        MERGE_STATUS=$(gh pr view $PR_NUMBER --repo menloresearch/llama.cpp --json mergeStateStatus --jq '.mergeStateStatus')
-        echo "PR merge status: $MERGE_STATUS"
-        
-        if [[ "$MERGE_STATUS" != "CLEAN" ]]; then
-          echo "PR has conflicts and needs manual review. Stopping automatic merge."
-          echo "SKIP_MERGE=true" >> $GITHUB_ENV
-          exit 0
-        fi
-        
         # Wait for CI checks using the more reliable method
         echo "Waiting for CI checks to complete..."
         while true; do
@@ -132,6 +122,16 @@ jobs:
             fi
           fi
         done
+        # Check if PR can be merged
+        MERGE_STATUS=$(gh pr view $PR_NUMBER --repo menloresearch/llama.cpp --json mergeStateStatus --jq '.mergeStateStatus')
+        echo "PR merge status: $MERGE_STATUS"
+        
+        if [[ "$MERGE_STATUS" != "CLEAN" ]]; then
+          echo "PR has conflicts and needs manual review. Stopping automatic merge."
+          echo "SKIP_MERGE=true" >> $GITHUB_ENV
+          exit 0
+        fi
+        
 
     - name: Merge PR and create tag
       if: ${{ env.SKIP_PR != 'true' && env.SKIP_MERGE != 'true' }}