From e6cb7ac4c9af4c872a9256608eb923b15bfba160 Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Fri, 8 Mar 2024 10:41:40 +0000
Subject: [PATCH] switch to short name for native containers

---
 .github/workflows/build.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dbada2..dc84432 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,33 +14,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        epics-target: [RTEMS-beatnik, linux-x86_64 ] #, linux-arm
+        epics-target: [RTEMS-beatnik, linux-x86_64, linux-aarch64]
         target: [developer, runtime]
+        base_image: [ubuntu:22.04]
+        os: [ubuntu-latest]
+        name: [epics-base]
         include:
           - epics-target: RTEMS-beatnik
             epics-host: linux-x86_64
-            image_name: rtems-beatnik
+            name: epics-base-rtems-beatnik
             base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1rc2
-            os: ubuntu-latest
             platform: linux/amd64
 
           - epics-target: linux-x86_64
             epics-host: linux-x86_64
-            image_name: linux
-            base_image: ubuntu:22.04
-            os: ubuntu-latest
             platform: linux/amd64
 
-          # - epics-target: linux-arm
-          #   epics-host: linux-arm
-          #   image_name: linux
-          #   base_image: ubuntu:22.04
-          #   os: ubuntu-latest
-          #   platform: linux/arm64
+          - epics-target: linux-aarch64
+            epics-host: linux-aarch64
+            platform: linux/arm64
 
     runs-on: ${{ matrix.os }}
     env:
-      TAG: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}-${{  matrix.image_name }}-${{ matrix.target }}:${{ github.ref_name }}
+      TAG: ghcr.io/${{ github.repository_owner }}/${{ matrix.name }}-${{ matrix.target }}:${{ github.ref_name }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4