From 7db91841d22e8a7db592225ad8309fae95f8d3ae Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Mon, 11 Mar 2024 11:00:09 +0000
Subject: [PATCH] switch to arm64 cross compile from native

---
 .github/workflows/build.yml | 17 +++++------------
 .gitignore                  |  1 +
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c24a10..1258c8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,28 +16,25 @@ jobs:
       matrix:
         epics-target: [RTEMS-beatnik, linux-x86_64, linux-aarch64]
         target: [developer, runtime]
+        os: [ubuntu-latest]
         include:
           - epics-target: RTEMS-beatnik
             epics-host: linux-x86_64
             name: epics-base-rtems-beatnik
             base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1rc2
             platform: linux/amd64
-            os: ubuntu-latest
 
           - epics-target: linux-x86_64
             epics-host: linux-x86_64
             name: epics-base
             base_image: ubuntu:22.04
             platform: linux/amd64
-            os: ubuntu-latest
 
           - epics-target: linux-aarch64
-            epics-host: linux-aarch64
-            # a temporary name until multi-arch is supported
-            name: epics-base-native-aarch64
+            epics-host: linux-x86_64
+            name: epics-base-aarch64
             base_image: ubuntu:22.04
-            platform: linux/arm64
-            os: ubuntu-latest
+            platform: linux/amd64
 
     runs-on: ${{ matrix.os }}
     env:
@@ -57,13 +54,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-
       - name: Build image
         uses: docker/build-push-action@v5
         with:
@@ -91,4 +84,4 @@ jobs:
             EPICS_HOST_ARCH=${{ matrix.epics-host }}
             BASE_IMAGE=${{ matrix.base_image }}
           tags: ${{ env.TAG }}
-          push: true
\ No newline at end of file
+          push: true
diff --git a/.gitignore b/.gitignore
index 9644380..67a818e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ repos/
 repos-build/
 *.log
 *.out
+*.code-workspace