Refine the workflow file

Author: tuhaihe

.github/workflows/package-convenience-binaries.yml

@@ -445,22 +445,15 @@ jobs:
         shell: bash
         env:
           SOURCE_DIR: ${{ steps.extract.outputs.source_dir }}
-          PACKAGE_TYPE: ${{ matrix.package_type }}
         run: |
           set -euo pipefail
           
           # Create build-logs directory and set ownership
           mkdir -p "${SOURCE_DIR}/build-logs"
           chown -R gpadmin:gpadmin "${SOURCE_DIR}/build-logs"
           
-          # Set BUILD_DESTINATION based on package type
-          # DEB: install to debian/build (same as build-deb-cloudberry-ubuntu24.04.yml)
-          # RPM: install to default location
-          if [[ "${PACKAGE_TYPE}" == "deb" ]]; then
-            export BUILD_DESTINATION="${SOURCE_DIR}/debian/build"
-          else
-            export BUILD_DESTINATION="/usr/local/cloudberry-db"
-          fi
+          # Use /usr/local/cloudberry-db for all platforms
+          export BUILD_DESTINATION="/usr/local/cloudberry-db"
           
           chmod +x "${SOURCE_DIR}"/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
           chmod +x "${SOURCE_DIR}"/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
@@ -479,16 +472,11 @@ jobs:
         shell: bash
         env:
           SOURCE_DIR: ${{ steps.extract.outputs.source_dir }}
-          PACKAGE_TYPE: ${{ matrix.package_type }}
         run: |
           set -euo pipefail
           
-          # Set BUILD_DESTINATION to match build stage
-          if [[ "${PACKAGE_TYPE}" == "deb" ]]; then
-            export BUILD_DESTINATION="${SOURCE_DIR}/debian/build"
-          else
-            export BUILD_DESTINATION="/usr/local/cloudberry-db"
-          fi
+          # Use /usr/local/cloudberry-db for all platforms
+          export BUILD_DESTINATION="/usr/local/cloudberry-db"
           
           chmod +x "${SOURCE_DIR}"/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
           if ! su - gpadmin -c "cd ${SOURCE_DIR} && SRC_DIR=${SOURCE_DIR} BUILD_DESTINATION=${BUILD_DESTINATION} ${SOURCE_DIR}/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh"; then
@@ -510,39 +498,31 @@ jobs:
           artifact_dir="${GITHUB_WORKSPACE}/package-artifacts"
           mkdir -p "${artifact_dir}"
 
-          # Set BUILD_DESTINATION to match build stage
+          # For DEB: Clean debian directory and let build-deb.sh copy from /usr/local/cloudberry-db
           if [[ "${PACKAGE_TYPE}" == "deb" ]]; then
-            export BUILD_DESTINATION="${SOURCE_DIR}/debian/build"
-            # Ensure debian directory exists and is writable
-            mkdir -p "${SOURCE_DIR}/debian"
-            chown -R gpadmin:gpadmin "${SOURCE_DIR}/debian"
-          else
-            export BUILD_DESTINATION="/usr/local/cloudberry-db"
+            rm -rf "${SOURCE_DIR}/debian"
           fi
 
           su - gpadmin -c "
             set -euo pipefail
             cd '${SOURCE_DIR}'
-            export BUILD_DESTINATION='${BUILD_DESTINATION}'
+            export BUILD_DESTINATION='/usr/local/cloudberry-db'
             if [[ '${PACKAGE_TYPE}' == 'deb' ]]; then
-              # Debug: Check architecture before packaging
-              echo '=== Architecture Debug Info ==='
-              dpkg --print-architecture || true
-              uname -m || true
-              echo '=== End Architecture Debug ==='
               '${SOURCE_DIR}/devops/build/packaging/deb/build-deb.sh' -v '${PACKAGING_VERSION}'
             else
               '${SOURCE_DIR}/devops/build/packaging/rpm/build-rpm.sh' -v '${PACKAGING_VERSION}' -r '1'
             fi
           "
 
           if [[ "${PACKAGE_TYPE}" == "deb" ]]; then
-            find "$(dirname "${SOURCE_DIR}")" -maxdepth 1 -type f \
-              \( -name '*.deb' -o -name '*.buildinfo' -o -name '*.changes' -o -name '*.dsc' \) \
+            find "$(dirname "${SOURCE_DIR}")" -maxdepth 1 -type f -name '*.deb' \
               -exec cp -f {} "${artifact_dir}/" \;
             primary_pattern='*.deb'
           else
+            # Copy RPM packages excluding debuginfo and debugsource packages
             find /home/gpadmin/rpmbuild/RPMS -type f -name '*.rpm' \
+              ! -name '*-debuginfo-*.rpm' \
+              ! -name '*-debugsource-*.rpm' \
               -exec cp -f {} "${artifact_dir}/" \;
             primary_pattern='*.rpm'
           fi
@@ -691,18 +671,22 @@ jobs:
         run: |
           set -euo pipefail
           artifact_dir="${GITHUB_WORKSPACE}/package-artifacts"
+          
+          # Find package file using ls
           if [[ "${PACKAGE_TYPE}" == "deb" ]]; then
-            package_file="$(find "${artifact_dir}" -maxdepth 1 -type f -name '*.deb' -print -quit)"
+            package_file=$(ls "${artifact_dir}"/*.deb 2>/dev/null | head -n 1)
           else
-            package_file="$(find "${artifact_dir}" -maxdepth 1 -type f -name '*.rpm' ! -name '*debuginfo*' -print -quit)"
+            package_file=$(ls "${artifact_dir}"/*.rpm 2>/dev/null | head -n 1)
           fi
 
           if [[ -z "${package_file}" || ! -f "${package_file}" ]]; then
-            echo "::error::Package file not found in ${artifact_dir}"
+            echo "::error::No ${PACKAGE_TYPE} package found in ${artifact_dir}"
+            ls -la "${artifact_dir}" || true
             exit 1
           fi
 
           checksum_file="${package_file}.sha512"
+          
           if [[ ! -f "${checksum_file}" ]]; then
             echo "::error::Checksum file not found: ${checksum_file}"
             exit 1