Make the search for a package more arch agnostic

This commit is contained in:
2025-12-03 18:58:59 -05:00
parent 0cc905a79d
commit 8af940127f

View File

@@ -67,13 +67,13 @@ runs:
run: | run: |
PACKAGE_NAME=$(basename -s .spec ${SPEC_FILE_PATH}) PACKAGE_NAME=$(basename -s .spec ${SPEC_FILE_PATH})
echo "Goal package to upload: ${PACKAGE_NAME}" echo "Goal package to upload: ${PACKAGE_NAME}"
RPM_PATH="./rpmbuild/RPMS/x86_64" RPM_PATH="./rpmbuild/RPMS/"
echo "Searching in ${RPM_PATH}" echo "Searching in ${RPM_PATH}"
ls ${RPM_PATH} ls ${RPM_PATH}
UPLOAD_URL="${REPOSITORY_URL}/api/packages/${REPOSITORY_OWNER}/rpm/${PACKAGE_GROUP}/upload" UPLOAD_URL="${REPOSITORY_URL}/api/packages/${REPOSITORY_OWNER}/rpm/${PACKAGE_GROUP}/upload"
echo "Uploading to url: ${UPLOAD_URL}" echo "Uploading to url: ${UPLOAD_URL}"
REGULAR_PACKAGE=$(find ${RPM_PATH} -maxdepth 1 -type f \( -name "${PACKAGE_NAME}*\.rpm" -a ! -name "*-devel*\.rpm" \) | head -1) REGULAR_PACKAGE=$(find ${RPM_PATH} -maxdepth 2 -type f \( -name "${PACKAGE_NAME}*\.rpm" -a ! -name "*-devel*\.rpm" \) | head -1)
DEVEL_PACKAGE=$(find ${RPM_PATH} -maxdepth 1 -type f -name "${PACKAGE_NAME}-devel*\.rpm" | head -1) DEVEL_PACKAGE=$(find ${RPM_PATH} -maxdepth 2 -type f -name "${PACKAGE_NAME}-devel*\.rpm" | head -1)
if [[ -n "$REGULAR_PACKAGE" ]]; then if [[ -n "$REGULAR_PACKAGE" ]]; then
echo "Found regular package at ${REGULAR_PACKAGE}, uploading it." echo "Found regular package at ${REGULAR_PACKAGE}, uploading it."
curl --user ${UPLOAD_USER}:${UPLOAD_USER_TOKEN} \ curl --user ${UPLOAD_USER}:${UPLOAD_USER_TOKEN} \