unkin/rpmbuilder
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: unkin:3742eabfde3413c81f936f69891463f0838ba763
Branches Tags
unkin:master
unkin:benvin/tooling
...
compare: unkin:4976f0e43bd2424bdda2f118e84ed48e02d1fb15
Branches Tags
unkin:master
unkin:benvin/tooling

2 Commits
3742eabfde ... 4976f0e43b

Author SHA1 Message Date
Ben Vincent
4976f0e43b Merge pull request 'fix: standardize artifact directory structure for multi-distro support' (#80) from benvin/artifact_upload into master
All checks were successful
Deploy / deploy-8 (push) Successful in 55s
Details
Deploy / deploy-9 (push) Successful in 1m5s
Details 
Reviewed-on: #80
 2026-03-01 22:24:06 +11:00
Ben Vincent
745ce03757 fix: standardize artifact directory structure for multi-distro support
All checks were successful
Build / build-8 (pull_request) Successful in 4m30s
Details
Build / build-9 (pull_request) Successful in 7m56s
Details 
Remove per-package subdirectories from build output to align with workflow expectations.
Update deploy workflow paths to match repository-based structure (dist/repository/*.rpm).
This enables consistent artifact handling across different Linux distributions.
 2026-03-01 22:11:23 +11:00
2 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

12
.gitea/workflows/deploy.yaml
View File

@ -19,10 +19,10 @@ jobs:
- name: Download Artifacts - name: Download Artifacts
run: | run: |
mkdir -p /workspace/unkin/rpmbuilder/dist/8 mkdir -p /workspace/unkin/rpmbuilder/dist/almalinux/el8
export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1)) export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8" curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8"
unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/8 unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/almalinux/el8
- name: Show RPMs - name: Show RPMs
run: | run: |
@ -32,7 +32,7 @@ jobs:
env: env:
DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }} DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
run: | run: |
for rpm in $(find /workspace/unkin/rpmbuilder/dist/8 -type f -name "*.rpm"); do for rpm in $(find /workspace/unkin/rpmbuilder/dist/almalinux/el8 -type f -name "*.rpm"); do
curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8/upload curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8/upload
done done
@ -48,10 +48,10 @@ jobs:
- name: Download Artifacts - name: Download Artifacts
run: | run: |
mkdir -p /workspace/unkin/rpmbuilder/dist/9 mkdir -p /workspace/unkin/rpmbuilder/dist/almalinux/el9
export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1)) export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9" curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9"
unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/9 unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/almalinux/el9
- name: Show RPMs - name: Show RPMs
run: | run: |
@ -61,6 +61,6 @@ jobs:
env: env:
DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }} DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
run: | run: |
for rpm in $(find /workspace/unkin/rpmbuilder/dist/9 -type f -name "*.rpm"); do for rpm in $(find /workspace/unkin/rpmbuilder/dist/almalinux/el9 -type f -name "*.rpm"); do
curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9/upload curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9/upload
done done

4
tools/build
View File

@ -651,8 +651,8 @@ def build_package_docker(
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
try: try:
# Ensure dist directory exists with repository structure # Ensure dist directory exists with repository structure (no package subdirectory)
package_dist_dir = dist_dir / repository / package_name package_dist_dir = dist_dir / repository
if not dry_run: if not dry_run:
package_dist_dir.mkdir(parents=True, exist_ok=True) package_dist_dir.mkdir(parents=True, exist_ok=True)