Bring back the find exec call to upload packages

downloaded

action.yml

@@ -6,7 +6,7 @@ inputs:
     required: true
   package-group:
     description: "Group repository to upload package to"
-    default: "43"
+    default: "f43"
   repository-url:
     description: "Gitea repository to upload package to"
     default: "https://git.hydrosaber.com"
@@ -16,6 +16,9 @@ inputs:
   repository-user-token:
     description: "Token to use with user"
     required: true
+  extra-source-directory:
+    description: "(Optional) Directory to grab files for sources."
+    default: ""
 
 runs:
   using: "composite"
@@ -28,6 +31,16 @@ runs:
         mkdir -p ./rpmbuild/{RPMS,SPECS}
         cp ${SPEC_FILE_PATH} ./rpmbuild/SPECS
 
+    - name: Add extra source files
+      shell: bash
+      if: "${{ inputs.extra-source-directory != '' }}"
+      env:
+        SOURCE_DIRECTORY: ${{ inputs.extra-source-directory }}
+      run: |
+        mkdir -p ./rpmbuild/PATCHES
+        find ${SOURCE_DIRECTORY} -type f -not -name "*\.spec" \
+          -exec cp {} ./rpmbuild/PATCHES \;
+
     - name: Build RPM
       shell: bash
       env:
@@ -45,14 +58,22 @@ runs:
     - name: Upload package
       shell: bash
       env:
+        SPEC_FILE_PATH: ${{ inputs.spec-file-path }}
         REPOSITORY_URL: ${{ inputs.repository-url }}
         PACKAGE_GROUP: ${{ inputs.package-group }}
-        GITEA_ACTOR: ${{ gitea.actor }}
+        REPOSITORY_OWNER: ${{ gitea.repository_owner }}
         UPLOAD_USER: ${{ inputs.repository-user }}
         UPLOAD_USER_TOKEN: ${{ inputs.repository-user-token }}
       run: |
+        PACKAGE_NAME=$(basename -s .spec ${SPEC_FILE_PATH})
+        echo "Goal package to upload: ${PACKAGE_NAME}"
+        RPM_PATH="./rpmbuild/RPMS/"
+        echo "Searching in ${RPM_PATH}"
+        find ./rpmbuild/RPMS/ -type f -name "*.rpm"
+        UPLOAD_URL="${REPOSITORY_URL}/api/packages/${REPOSITORY_OWNER}/rpm/${PACKAGE_GROUP}/upload"
+        echo "Uploading to url: ${UPLOAD_URL}"
         find ./rpmbuild/RPMS/ -name "*.rpm" -type f \
           -exec curl \
           --user ${UPLOAD_USER}:${UPLOAD_USER_TOKEN} \
           --upload-file {} \
-          ${REPOSITORY_URL}/api/packages/${GITEA_ACTOR}/rpm/${PACKAGE_GROUP}/upload \;
+          ${UPLOAD_URL} \;

entrypoint.sh

@@ -1,11 +1,19 @@
 #!/usr/bin/env bash
 
-dnf -y config-manager addrepo --from-repofile=https://git.hydrosaber.com/api/packages/hydros/rpm/f43.repo
+echo "--- Start adding repos and priorities ---"
+dnf5 -y config-manager addrepo --from-repofile=https://git.hydrosaber.com/api/packages/hydros/rpm/f43.repo
 
-dnf -y install rpmdevtools
+echo "--- Setup workspace and packages ---"
+dnf5 -y install rpmdevtools
 rpmdev-setuptree
 
-dnf -y builddep $1
+dnf5 -y builddep $1
 
+echo "--- Download sources ---"
 rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1
-rpmbuild --nodebuginfo --bb $1
+
+echo "--- Add patches ---"
+cp ~/rpmbuild/PATCHES/* ~/rpmbuild/SOURCES
+
+echo "--- Build RPM packages ---"
+rpmbuild --nodebuginfo --bb $1 && echo "--- Done! ---"