From c5c954c17f94b582cef29a6fc55bfe37a3a2abdf Mon Sep 17 00:00:00 2001
From: Dani Llewellyn <diddledani@ubuntu.com>
Date: Thu, 2 Mar 2023 19:59:38 +0000
Subject: [PATCH] Allow core builds to run on ubuntu-latest during testsuite

Signed-off-by: Dani Llewellyn <diddledani@ubuntu.com>
---
 .github/workflows/test.yml | 41 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e116932..fe44d56 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,6 @@ jobs:
     strategy:
       matrix:
         base:
-          - core
           - core18
           - core20
           - core22
@@ -33,20 +32,58 @@ jobs:
           - ''
           - 'true'
           - 'false'
+        runner:
+          - ubuntu-latest
         include:
+          - base: core
+            arch: ''
+            usePodman: 'false'
+            runner: ubuntu-18.04
+          - base: core
+            arch: ''
+            usePodman: 'true'
+            runner: ubuntu-18.04
           - base: core
             arch: i386
             usePodman: 'false'
+            runner: ubuntu-18.04
           - base: core
             arch: i386
             usePodman: 'true'
+            runner: ubuntu-18.04
+          - base: core
+            arch: amd64
+            usePodman: 'false'
+            runner: ubuntu-18.04
+          - base: core
+            arch: amd64
+            usePodman: 'true'
+            runner: ubuntu-18.04
+          - base: core
+            arch: armhf
+            usePodman: 'false'
+            runner: ubuntu-18.04
+          - base: core
+            arch: armhf
+            usePodman: 'true'
+            runner: ubuntu-18.04
+          - base: core
+            arch: arm64
+            usePodman: 'false'
+            runner: ubuntu-18.04
+          - base: core
+            arch: arm64
+            usePodman: 'true'
+            runner: ubuntu-18.04
           - base: core18
             arch: i386
             usePodman: 'false'
+            runner: ubuntu-latest
           - base: core18
             arch: i386
             usePodman: 'true'
-    runs-on: ubuntu-latest
+            runner: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     steps:
     - uses: docker/setup-qemu-action@v2
     - uses: actions/checkout@v3