From e81633af8b7c892a4a62b5273c0a69079d17911e Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 30 Mar 2026 00:53:42 -0400 Subject: [PATCH] Revert LOCALSOURCE change, pipe install rpmdevtools to null to reduce log output --- action.yml | 4 ++-- entrypoint.sh | 19 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/action.yml b/action.yml index 5e359a4..1fb6048 100644 --- a/action.yml +++ b/action.yml @@ -40,10 +40,10 @@ runs: env: SOURCE_DIRECTORY: ${{ inputs.extra-source-directory }} run: | - mkdir -p ./rpmbuild/LOCALSOURCE + mkdir -p ./rpmbuild/SOURCES BASENAME=$(basename "${SOURCE_DIRECTORY}") DIRNAME=$(dirname "${SOURCE_DIRECTORY}") - tar -czf ./rpmbuild/LOCALSOURCE/source.tar.gz -C ${DIRNAME} ${BASENAME} + tar -czf ./rpmbuild/SOURCES/source.tar.gz -C ${DIRNAME} ${BASENAME} - name: Add extra patch files shell: bash diff --git a/entrypoint.sh b/entrypoint.sh index e61d970..7a7c7c3 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,23 +4,18 @@ echo "--- Start adding repos and priorities ---" dnf5 -y config-manager addrepo --from-repofile=https://git.hydrosaber.com/api/packages/hydros/rpm/f43.repo echo "--- Setup workspace and packages ---" -dnf5 -y install rpmdevtools +dnf5 -y -q install rpmdevtools > /dev/null 2>&1 rpmdev-setuptree dnf5 -y builddep $1 -if [[ -f "~/rpmbuild/LOCALSOURCE/source.tar.gz" ]]; then - echo "--- Peaking inside source.tar.gz ---" - tar -rf ~/rpmbuild/LOCALSOURCE/source.tar.gz - mv ~/rpmbuild/LOCALSOURCE/source.tar.gz ~/rpmbuild/SOURCES/source.tar.gz -else - echo "--- source.tar.gz not found ---" - echo "--- Download sources ---" - rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1 -fi +echo "--- Download sources ---" +rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1 -echo "--- Add patches ---" -cp ~/rpmbuild/PATCHES/* ~/rpmbuild/SOURCES +if [[ -d ~/rpmbuild/PATCHES ]]; then + echo "--- Add patches ---" + cp ~/rpmbuild/PATCHES/* ~/rpmbuild/SOURCES +fi echo "--- Build RPM packages ---" rpmbuild --nodebuginfo --bb $1 && echo "--- Done! ---"