From 1129cffa0d20d6b7ba4314a05aedb43abef83214 Mon Sep 17 00:00:00 2001
From: Adam Nash <adam@smr.llc>
Date: Mon, 20 Feb 2023 12:42:56 -0500
Subject: [PATCH] ci: do separate 20.04 and 22.04 artifacts

---
 .github/workflows/dev-build.yml  |  2 +-
 .github/workflows/prod-build.yml | 23 +++++++++++++++++++++--
 ci/full.releaserc.json           |  7 ++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 923169ba..70d755ff 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -56,6 +56,6 @@ jobs:
 
       - uses: actions/download-artifact@v3
           
-      - name: Display structure of downloaded files
+      - name: Check Files
         run: ls -R
 
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index 0ee6f956..ff793633 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -6,7 +6,11 @@ on:
       - master
 jobs:
   Build-Hobbits:
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+            os: [ubuntu-20.04, ubuntu-22.04]
+
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -44,11 +48,26 @@ jobs:
         run: ninja package -C build
       - uses: actions/upload-artifact@v3
         with:
-          name: DEB Packages
+          name: DEB Packages ${{ matrix.os }}
           path: build/hobbits-*deb*
 
+  Release-Hobbits:
+    needs: Build-Hobbits
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+          
+      - name: Check Files
+        run: ls -R
+
       - name: Semantic Release
         run: |
+          npm ci
           cp ci/full.releaserc.json .releaserc.json
           npx semantic-release
         env:
diff --git a/ci/full.releaserc.json b/ci/full.releaserc.json
index 50b48489..845eea79 100644
--- a/ci/full.releaserc.json
+++ b/ci/full.releaserc.json
@@ -25,7 +25,12 @@
             {
                 "assets": [
                     {
-                        "path": "build/hobbits*deb*"
+                        "path": "DEB Packages ubuntu-20.04/*.deb",
+                        "name": "DEB Package for Ubuntu 20.04"
+                    },
+                    {
+                        "path": "DEB Packages ubuntu-22.04/*.deb",
+                        "name": "DEB Package for Ubuntu 22.04"
                     }
                 ]
             }