From 745ce03757af4a0983ca4962331068011bda1a1d Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 1 Mar 2026 22:07:25 +1100
Subject: [PATCH] fix: standardize artifact directory structure for
 multi-distro support

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.
---
 .gitea/workflows/deploy.yaml | 12 ++++++------
 tools/build                  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index f322f0b..16d168a 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -19,10 +19,10 @@ jobs:
 
       - name: Download Artifacts
         run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist/8
+          mkdir -p /workspace/unkin/rpmbuilder/dist/almalinux/el8
           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"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/8
+          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/almalinux/el8
 
       - name: Show RPMs
         run: |
@@ -32,7 +32,7 @@ jobs:
         env:
           DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
         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
           done
 
@@ -48,10 +48,10 @@ jobs:
 
       - name: Download Artifacts
         run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist/9
+          mkdir -p /workspace/unkin/rpmbuilder/dist/almalinux/el9
           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"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/9
+          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/almalinux/el9
 
       - name: Show RPMs
         run: |
@@ -61,6 +61,6 @@ jobs:
         env:
           DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
         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
           done
diff --git a/tools/build b/tools/build
index 0fb46ca..ebc2c0a 100755
--- a/tools/build
+++ b/tools/build
@@ -651,8 +651,8 @@ def build_package_docker(
     logger = logging.getLogger(__name__)
 
     try:
-        # Ensure dist directory exists with repository structure
-        package_dist_dir = dist_dir / repository / package_name
+        # Ensure dist directory exists with repository structure (no package subdirectory)
+        package_dist_dir = dist_dir / repository
         if not dry_run:
             package_dist_dir.mkdir(parents=True, exist_ok=True)