From adedeed72584dc4758a506cddc855eef135f6395 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Fri, 20 Dec 2024 23:57:10 +1100
Subject: [PATCH] feat: add multi-release build jobs

- update build/deploy to be multiple jobs
- update to use multiple artifacts
---
 .gitea/workflows/build.yaml  | 28 ++++++++++++++++++++++++--
 .gitea/workflows/deploy.yaml | 39 +++++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 9dd05ec..3bdafa0 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  build-8:
     runs-on: almalinux-8
     container:
       image: git.query.consul/unkin/almalinux8-runnerdnd:latest
@@ -27,5 +27,29 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: rpms
+          name: rpms-8
+          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+
+  build-9:
+    runs-on: almalinux-8
+    container:
+      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
+      options: --privileged
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Build Packages
+        run: |
+          make all
+
+      - name: Show RPMs
+        run: |
+          find /workspace -type f -name "*.rpm"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: rpms-9
           path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 1cc8609..08a129c 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  deploy:
+  deploy-8:
     runs-on: almalinux-8
     container:
       image: git.query.consul/unkin/almalinux8-runnerdnd:latest
@@ -19,10 +19,10 @@ jobs:
 
       - name: Download Artifacts
         run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist
+          mkdir -p /workspace/unkin/rpmbuilder/dist/8
           export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
-          curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist
+          curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8"
+          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/8
 
       - name: Show RPMs
         run: |
@@ -32,6 +32,35 @@ jobs:
         env:
           DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
         run: |
-          for rpm in $(find /workspace -type f -name "*.rpm"); do
+          for rpm in $(find /workspace/unkin/rpmbuilder/dist/8 -type f -name "*.rpm"); do
             curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el8/upload
           done
+
+  deploy-9:
+    runs-on: almalinux-8
+    container:
+      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
+      options: --privileged
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Artifacts
+        run: |
+          mkdir -p /workspace/unkin/rpmbuilder/dist/9
+          export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
+          curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9"
+          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/9
+
+      - name: Show RPMs
+        run: |
+          find /workspace -type f -name "*.rpm"
+
+      - name: Upload RPMs to Gitea
+        env:
+          DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
+        run: |
+          for rpm in $(find /workspace/unkin/rpmbuilder/dist/9 -type f -name "*.rpm"); do
+            curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el9/upload
+          done