Allow spcification for fedora image version to build on

log output

action.yml

@@ -22,6 +22,9 @@ inputs:
   extra-patch-directory:
     description: "(Optional) Directory to grab files for patches."
     default: ""
+  fedora-version:
+    description: "(Optional) Version of fedora to build on"
+    default: "latest"
 
 runs:
   using: "composite"
@@ -32,7 +35,7 @@ runs:
         SPEC_FILE_PATH: ${{ inputs.spec-file-path }}
       run: |
         mkdir -p ./rpmbuild/{RPMS,SPECS}
-        cp ${SPEC_FILE_PATH} ./rpmbuild/SPECS
+        mv ${SPEC_FILE_PATH} ./rpmbuild/SPECS
 
     - name: Specify a source directory
       shell: bash
@@ -43,8 +46,7 @@ runs:
         mkdir -p ./rpmbuild/SOURCES
         BASENAME=$(basename "${SOURCE_DIRECTORY}")
         DIRNAME=$(dirname "${SOURCE_DIRECTORY}")
-        tar -czf source.tar.gz -C ${DIRNAME} ${BASENAME}
+        tar -czf ./rpmbuild/SOURCES/source.tar.gz -C ${DIRNAME} ${BASENAME}
-        mv source.tar.gz ./rpmbuild/SOURCES/
 
     - name: Add extra patch files
       shell: bash
@@ -61,13 +63,14 @@ runs:
       env:
         SPEC_FILE_PATH: ${{ inputs.spec-file-path }}
         ACTION_ROOT: ${{ gitea.action_path }}
+        FEDORA_TAG: ${{ inputs.fedora-version }}
       run: |
         SPEC_FILE_NAME=$(basename ${SPEC_FILE_PATH})
         podman run --rm \
           -v ./rpmbuild:/root/rpmbuild:rw,z \
           -v ${ACTION_ROOT}/entrypoint.sh:/root/entrypoint.sh:ro,z \
           -w /root \
-          fedora:latest \
+          fedora:${FEDORA_TAG} \
           /root/entrypoint.sh /root/rpmbuild/SPECS/${SPEC_FILE_NAME}
 
     - name: Upload package

entrypoint.sh

@@ -4,22 +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/SOURCES/source.tar.gz" ]]; then
-	echo "--- Peaking inside source.tar.gz ---"
-	tar -rf ~/rpmbuild/SOURCES/source.tar.gz
-else
-	echo "--- source.tar.gz not found ---"
 echo "--- Download sources ---"
 rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1
-fi
 
+if [[ -d ~/rpmbuild/PATCHES ]]; then
 	echo "--- Add patches ---"
 	cp ~/rpmbuild/PATCHES/* ~/rpmbuild/SOURCES
+fi
 
 echo "--- Build RPM packages ---"
 rpmbuild --nodebuginfo --bb $1 && echo "--- Done! ---"