From 174895d0dce7fa903423c2da35c1a80af538a672 Mon Sep 17 00:00:00 2001
From: Brad Cowie <brad@faucet.nz>
Date: Tue, 7 Dec 2021 13:44:22 +1300
Subject: [PATCH] Fix ubuntu package uploads.

---
 .github/workflows/release-debian.yml | 22 +++++++++++++++++-----
 .github/workflows/test-debian.yml    | 22 +++++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-debian.yml b/.github/workflows/release-debian.yml
index 644b318..e6d9b84 100644
--- a/.github/workflows/release-debian.yml
+++ b/.github/workflows/release-debian.yml
@@ -76,39 +76,51 @@ jobs:
         include:
           - distro: "debian"
             release: "buster"
+            image: "buster"
             arch: "armv7"
           - distro: "debian"
             release: "buster"
+            image: "buster"
             arch: "aarch64"
           - distro: "debian"
             release: "bullseye"
+            image: "bullseye"
             arch: "armv7"
           - distro: "debian"
             release: "bullseye"
+            image: "bullseye"
             arch: "aarch64"
           - distro: "ubuntu"
-            release: "ubuntu18.04"
+            release: "bionic"
+            image: "ubuntu18.04"
             arch: "armv7"
           - distro: "ubuntu"
-            release: "ubuntu18.04"
+            release: "bionic"
+            image: "ubuntu18.04"
             arch: "aarch64"
           - distro: "ubuntu"
-            release: "ubuntu20.04"
+            release: "focal"
+            image: "ubuntu20.04"
             arch: "armv7"
           - distro: "ubuntu"
-            release: "ubuntu20.04"
+            release: "focal"
+            image: "ubuntu20.04"
             arch: "aarch64"
           - distro: "raspbian"
             release: "buster"
+            image: "buster"
             arch: "armv7"
           - distro: "raspbian"
             release: "buster"
+            image: "buster"
             arch: "aarch64"
           - distro: "raspbian"
             release: "bullseye"
+            image: "bullseye"
             arch: "armv7"
           - distro: "raspbian"
             release: "bullseye"
+            image: "bullseye"
             arch: "aarch64"
     steps:
       - name: Checkout repo
@@ -118,7 +130,7 @@ jobs:
         id: build
         with:
           arch: ${{ matrix.arch }}
-          distro: ${{ matrix.release }}
+          distro: ${{ matrix.image }}
           shell: /bin/bash
           install: |
             apt-get update
diff --git a/.github/workflows/test-debian.yml b/.github/workflows/test-debian.yml
index e0eb7d6..a26910f 100644
--- a/.github/workflows/test-debian.yml
+++ b/.github/workflows/test-debian.yml
@@ -58,39 +58,51 @@ jobs:
         include:
           - distro: "debian"
             release: "buster"
+            image: "buster"
             arch: "armv7"
           - distro: "debian"
             release: "buster"
+            image: "buster"
             arch: "aarch64"
           - distro: "debian"
             release: "bullseye"
+            image: "bullseye"
             arch: "armv7"
           - distro: "debian"
             release: "bullseye"
+            image: "bullseye"
             arch: "aarch64"
           - distro: "ubuntu"
-            release: "ubuntu18.04"
+            release: "bionic"
+            image: "ubuntu18.04"
             arch: "armv7"
           - distro: "ubuntu"
-            release: "ubuntu18.04"
+            release: "bionic"
+            image: "ubuntu18.04"
             arch: "aarch64"
           - distro: "ubuntu"
-            release: "ubuntu20.04"
+            release: "focal"
+            image: "ubuntu20.04"
             arch: "armv7"
           - distro: "ubuntu"
-            release: "ubuntu20.04"
+            release: "focal"
+            image: "ubuntu20.04"
             arch: "aarch64"
           - distro: "raspbian"
             release: "buster"
+            image: "buster"
             arch: "armv7"
           - distro: "raspbian"
             release: "buster"
+            image: "buster"
             arch: "aarch64"
           - distro: "raspbian"
             release: "bullseye"
+            image: "bullseye"
             arch: "armv7"
           - distro: "raspbian"
             release: "bullseye"
+            image: "bullseye"
             arch: "aarch64"
     steps:
       - name: Checkout repo
@@ -100,7 +112,7 @@ jobs:
         id: build
         with:
           arch: ${{ matrix.arch }}
-          distro: ${{ matrix.release }}
+          distro: ${{ matrix.image }}
           shell: /bin/bash
           install: |
             apt-get update