Merge building and uploading into one step

This commit is contained in:
2025-11-30 21:54:43 -05:00
parent 2fd8e42566
commit 9ab81474ec

View File

@@ -28,11 +28,16 @@ runs:
mkdir -p ./rpmbuild/{RPMS,SPECS} mkdir -p ./rpmbuild/{RPMS,SPECS}
cp ${SPEC_FILE_PATH} ./rpmbuild/SPECS cp ${SPEC_FILE_PATH} ./rpmbuild/SPECS
- name: Build RPM - name: Build and Upload RPM
shell: bash shell: bash
env: env:
SPEC_FILE_PATH: ${{ inputs.spec-file-path }} SPEC_FILE_PATH: ${{ inputs.spec-file-path }}
ACTION_ROOT: ${{ gitea.action_path }} ACTION_ROOT: ${{ gitea.action_path }}
REPOSITORY_URL: ${{ inputs.repository-url }}
PACKAGE_GROUP: ${{ inputs.package-group }}
GITEA_ACTOR: ${{ gitea.actor }}
UPLOAD_USER: ${{ inputs.repository-user }}
UPLOAD_USER_TOKEN: ${{ inputs.repository-user-token }}
run: | run: |
SPEC_FILE_NAME=$(basename ${SPEC_FILE_PATH}) SPEC_FILE_NAME=$(basename ${SPEC_FILE_PATH})
podman run --rm \ podman run --rm \
@@ -41,16 +46,6 @@ runs:
-w /root \ -w /root \
fedora:latest \ fedora:latest \
/root/entrypoint.sh /root/rpmbuild/SPECS/${SPEC_FILE_NAME} /root/entrypoint.sh /root/rpmbuild/SPECS/${SPEC_FILE_NAME}
- name: Upload package
shell: bash
env:
REPOSITORY_URL: ${{ inputs.repository-url }}
PACKAGE_GROUP: ${{ inputs.package-group }}
GITEA_ACTOR: ${{ gitea.actor }}
UPLOAD_USER: ${{ inputs.repository-user }}
UPLOAD_USER_TOKEN: ${{ inputs.repository-user-token }}
run: |
find ./rpmbuild/RPMS/ -name "*.rpm" -type f \ find ./rpmbuild/RPMS/ -name "*.rpm" -type f \
-exec curl \ -exec curl \
--user ${UPLOAD_USER}:${UPLOAD_USER_TOKEN} \ --user ${UPLOAD_USER}:${UPLOAD_USER_TOKEN} \