Fix CI: Restore make cluster, fix test environment, and add regression diff display

Author: tuhaihe

.github/workflows/binary-swap-check.yml

@@ -610,27 +610,24 @@ jobs:
           
           ln -sfn "${BASELINE_INSTALL_DIR}" "${CBDB_INSTALL_DIR}"
           su - gpadmin -c "
+            # 1. Set up environment using baseline to allow cluster creation
             if [ -f ${CBDB_INSTALL_DIR}/cloudberry-env.sh ]; then
               source ${CBDB_INSTALL_DIR}/cloudberry-env.sh
             else
               source ${CBDB_INSTALL_DIR}/greenplum_path.sh
             fi
+            
+            # 2. Create the cluster
             cd ${GITHUB_WORKSPACE}/gpAux/gpdemo
-            make cluster
-            source gpdemo-env.sh
-            gpstate -s
-          "
-
-          # Now run the test script
-          # The script will:
-          # 1. Start baseline (-b)
-          # 2. Dump
-          # 3. Swap to current (-c)
-          # 4. Dump & Verify
-          
-          su - gpadmin -c "
-            cd ${GITHUB_WORKSPACE}/gpAux/gpdemo
+            if ! make cluster; then
+               echo '::error::Failed to create gpdemo cluster'
+               exit 1
+            fi
+            
+            # 3. Load cluster-specific environment (port, data dir)
             source gpdemo-env.sh
+            
+            # 4. Run the actual binary swap test script
             cd ${SRC_DIR}/src/test/binary_swap
             ./test_binary_swap.sh -b ${BASELINE_INSTALL_DIR} -c ${CURRENT_INSTALL_DIR}
           " 2>&1 | tee -a "${LOGS_DIR}/details/test_binary_swap.log" || TEST_RESULT=$?
@@ -640,6 +637,29 @@ jobs:
             echo "test_passed=false" >> "$GITHUB_OUTPUT"
             exit 1
           fi
+
+      - name: Check and Display Regression Diffs
+        if: always()
+        run: |
+          echo "Checking for regression diffs in ${SRC_DIR}/src/test/binary_swap"
+          if [ -d "${SRC_DIR}/src/test/binary_swap" ]; then
+            find "${SRC_DIR}/src/test/binary_swap" -name "*.diff" | while read diff_file; do
+              echo "======================================================================"
+              echo "Diff in ${diff_file}:"
+              echo "----------------------------------------------------------------------"
+              cat "${diff_file}"
+              echo "======================================================================"
+            done
+            
+            # Also check for regression.diffs
+            if [ -f "${SRC_DIR}/src/test/binary_swap/regression.diffs" ]; then
+               echo "======================================================================"
+               echo "Content of regression.diffs:"
+               echo "----------------------------------------------------------------------"
+               cat "${SRC_DIR}/src/test/binary_swap/regression.diffs"
+               echo "======================================================================"
+            fi
+          fi
           echo "test_passed=true" >> "$GITHUB_OUTPUT"
 
       - name: Generate Report